| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: Ia29a9aa855aa3bfab1a26fc3671b6c5436c176c1
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix warning:
widgetbox\widgetboxtreewidget.cpp:70:20: warning: 'qtLogoC' defined but not used [-Wunused-variable]
static const char *qtLogoC = "qtlogo.png";
Amends change 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9.
Change-Id: I4908a067c654d706f24d0afafd99142241ad3f69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When changing primary screens of multi-monitor-setups on Windows,
out-of-screen positions might be saved which make it impossible to bring
the tool back and also cause crashes when no screen is found for grabbbing.
Check the saved position when reading the settings and check if a screen
can be obtained for grabbing.
Change-Id: I69ec677e144306290a4ee7a3e84f87dd600ff086
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: I030c3c28510163bc7c35f82808b3882e68e51857
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
|\ \
| | |
| | |
| | | |
Change-Id: Ibaac0fc6ca0ec7c911793451f8d80dbe2758c41c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change downports the
56ac0c12ab5e7269e16bcc1248e4241302d91d09
change to the 5.7.1 branch in order to
have a chance for releasing Qt Creator 4.2
with a fix. The crash doesn't appear in
the standalone Designer, it only appears
in the Designer plugin of Qt Creator during reload.
There is no other way to fix that crash
outside of Qt.
Task-number: QTCREATORBUG-17150
Change-Id: Ide521677a1526d3de862d0d8e283531a67b2a7a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 56ac0c12ab5e7269e16bcc1248e4241302d91d09)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QWebEngineView requires that OpenGL context sharing is enabled.
This needs to happen before the first OpenGL context is created. In
QtWebEngine we don't do this automatically for dynamic builds anymore
(commit e2541ebdfadea0fe43baac748cfa9e07f3b57215)
Change-Id: I07e10cf6986650f1e2fdebdc04fb5d65774f393a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|\ \ \
| |/ /
|/| /
| |/ |
Change-Id: I4ee208f69bed72c480c636cb18f22fd88c02d1e5
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When Qt is configured with -qtlibinfix then it will insert
the specified setting inside the framework names. Therefore
QtCore.framework can be called QtCoreLibInfix.framework. This
means that we have to account for this in macdeployqt when
determining which plugins should be deployed.
Change-Id: I30fc7434fa87d1b41c2cacfbc9f76d4ce5491329
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
lupdate parses qrc files specified by the RESOURCES qmake variable or by
command line options, and adds files in them as source files.
[ChangeLog][lupdate] Added qrc resource file support
Task-number: QTBUG-53206
Change-Id: Id7f952487ab11e062db9c5a419fb2ee3c4716740
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... as lupdate doesn't execute any. this increases the chance that we
will get a complete picture of the project.
this is preparation for lupdate interpreting .qrc files.
Task-number: QTBUG-53206
Change-Id: I5e10b44637d527799f55c578a99076eb4750f131
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ib99cf27f50f32eb23d278f5b9a9c279d10da4ece
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
pre-calculate the lrelease/lconvert path once.
Change-Id: Ia1603db955ef08e61d123393f6e69c4653d8b6a9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The \legalese command is not used in Qt 5 documentation, because it
does not support collating license texts across modules.
Update the documentation accordingly, and remove the obsolete example
on how it's being used in Qt docs.
Change-Id: Id3505ccf5b44bd2c2e236b8464dea18d4c7b8a89
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I46c41a94ab1429e527ef01e342ee3f6578fa1876
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add a function qtLogoIcon() returning a multi-size icon
to iconloader_p.h.
Adapt the plugin dialog and widget box so that the logo icon
is returned for empty icon names.
Task-number: QTBUG-55137
Change-Id: If6843e75577b05c3bfcedf976849eba88b914547
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace the single size Qt logo by a series of icons, providing
higher resolutions for High DPI.
Task-number: QTBUG-55137
Change-Id: Ib128f679a8d9c6ce39ec0ae76c0d569d142aa636
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Set FILE_FLAG_DELETE_ON_CLOSE on the files used
for redirectoring process outputs.
Task-number: QTBUG-56268
Change-Id: Ia0b25ed9067e0a40a9b83dc7d10a9cf15ac63b70
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Iaa0f82a8418fa2be387fb3da7220b88d8b776e4c
|
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I9ca96bc3408160261781697a3471c1f446c86c3a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/57ca8d2698f1eaf30f1110ba47445c04d2bcd0f7)
(cherry picked from qtbase/85d7c732e9b84a9afdb040d01e7bb7166f605abe)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
this doesn't actually do anything in lupdate; just syncing up.
Change-Id: I5e5df9f6d136601f0f36a8d645f90a1cab9995ad
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/f8ef7e1d2619e6d394c57561bb275767f0517b24)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
when the file name is empty, the path will be returned verbatim. this
must be considered when constructing the return value.
Task-number: QTBUG-54550
Change-Id: Ie108ed52275e66a154ef63bd6f7193f55b3e0454
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/3c8134958c66f40bb86588aa91b83bf58b5de0c9)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I3aa4c736acec44f95a0a33c7baae9276568f684f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/d459a6b0e0d4f128caceaafe981ecf374bb3e420)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-41830
Change-Id: Iba3eee4975a1ee671b7190e52c0efc9a18147c62
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/dacf3994ba29106132c3a377dba303acdb74daca)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
that can make sense if a function which determines the availability of
a dependency fails to do so for unexpected reasons.
Change-Id: If6cd113df25aee66830c120a2fab067c822a4543
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/1b4ea11332f74984a62a4cc4597ad49f5b5269dc)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
it didn't, which is rather unexpected.
Change-Id: I8cdb7b1490a8c2207809812b93cc65fbe23a1b98
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/339b9706ccbed4063a92337c9994731793558b0a)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
if() would simply "downgrade" a fatal error to a false condition, which
is certainly not expected.
Change-Id: Ie9c54f2bddf588856498bf795007b341b7c9363a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/b27d4835c2ae0d8767ca914acb72a4bdcea6fc85)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I0c6fceac0b984e4613932b8507a632dd83d0e79b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/d0055e9fd7825f9033b26f9aa421e218e44dadde)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Works around a bug in the Windows C Runtime.
Change-Id: I792599a4cd7822f109fa921f02207fb1b144b1d1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/23bce6b169ca14ff72b672965ed5f89424c2d8fe)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Found by UBSan:
qmake/library/qmakeparser.cpp:278:33: runtime error: null pointer passed as argument 2, which is declared to never be null
Guard the call.
Change-Id: I99341ab439a511f366dae9344ddcc8727c33b9b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/1fd0d57ce3da83631423d17faadf97133f5c7835)
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... in string comparisons. It's more efficient.
Change-Id: I5d54ab7777a0838455eaaac671e735eb37bfe243
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from qtbase/f384c3097911c523e67620b77b1086e4788cd209)
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Improve the contents of the navigation bar for pages generated with
the \page command: If the \page is a member of a single group (uses
a single \ingroup command), the related \group page exists and has a
title, then inject a link to the group page into the navigation bar.
Pages can be members of multiple groups; if so, we do not use the
information for navigation as there's no mechanism to determine the
'primary' group.
Change-Id: I7e7e3167b3a90a94fd7d0a14f412046310ad9414
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This helps in styling them differently from 'real' code snippets, if
required.
Change-Id: I8cc868342f28c8f4cbaeff8421958c96d4352f5a
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ie87b293b1ed9d509a70ee5f8677c05365db37aa5
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add library and plugin directory.
Task-number: QTBUG-55977
Change-Id: I594cea7f7d18bbf6e8e0e07e1ea48b76dcbe64fc
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Added binary compatibility data files for tst_bic test
Change-Id: Ibe71e2ae4da3c886bc3871f5fa495664fb76a880
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added the generated data files for the binary compatibility tests
for QtTools for Qt 5.7.
Change-Id: I5703e2780daf2ad406013f30069e6f79c45db85f
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/qdoc/doc/qdoc-manual-markupcmds.qdoc
Change-Id: I43e2d334a848397a2e619ad19aab66daff53d9b7
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Move the exclusion check to a static function and
suppress the warning for the fake QWebEngineView class, too.
Task-number: QTBUG-53984
Change-Id: I445bcf37b92e5677342e18698fd4b0b07fa4ca10
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iaa5783b026ecb98d39000b408421aa13f965e2ca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the Mac platform
is discussed to use the macro \macos (defined in the documentation
configuration in qtbase), except within \code blocks in QDoc manual,
where macros are not expanded.
Change-Id: Ic742163948f3970d2acaa179eb02d4e0c1593bf8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iaffd91fc1d6a31bc2ade50f1fad6f1d544b07f73
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
More than two thirds of main() concerned parsing the command-line
arguments and settings globals, interacting minimally with the rest.
So split that code out into a sub-class of the command-line parser, to
make main() itself easier to read.
Changed a QStringLiteral to a QLatin1String to work round an MSVC-2010
issue.
Change-Id: Idd5fec280b0ce631f1d6d2a79cb59f9c4171eceb
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For remote devices winrtrunner needs to create an appx package for
deployment. While creating that package a file extension list has been
used to identify potential files by Qt which need to be deployed.
This was broken for Qt Quick Controls applications, but also for
projects using for instance jpeg image files.
Instead, switch to an exclusion list of file extensions we can be sure
should not be part of the package. In the worst case the package is too
big when deployed with winrtrunner, but will not cause runtime errors
anymore.
Change-Id: Ief6d4aaf9bc0933b32734feacbef170dcc8ab945
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-55137
Change-Id: I60e25790eda55db78d2a474b1d269db33439f83b
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc maintains a global map of base types for all QML types. This
caused issues whenever QML modules have conflicting type names;
for example, types from Qt Quick Controls (v1) were incorrectly
marked as deriving from QQC v2 'Control' type.
To improve the situation, make following changes:
- Manage 'inherited by' map in a single location. Types are
added to this map in a pre-generate step
(QDocDatabase::resolveQmlInheritance()) after parsing all
sources. This allows better control of searching - if the
QML type node has an import list, the search is now
always based on it.
- Add a safeguard against using a base type from a module
with major version different to the import statement.
- Use node pointers as keys in 'Inherited by' map,
instead of type-name strings.
Task-number: QTBUG-53529
Change-Id: I6665a520c9197fa90e84d67b12e3405b5b3f0901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc ignored the type (genus) of the node when resolving links to
function arguments or return types.
This commit ensures that C++ function signatures contain no links
to QML types, and vice versa.
Task-number: QTBUG-54875
Change-Id: If8369e3e86f6854044b394b82cfdd8379cfbcf8e
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/designer/src/designer/qdesigner.cpp
One side changed Q_OS_MAC -> Q_OS_MACOS;
the other changed it to Q_OS_OSX and combined with Q_OS_WIN.
Kept the latter.
tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
One side added some XML next to where another made a local change.
Change-Id: I812b55fbaccc85baa9856aedf90f9258428dfcab
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In earlier versions of OSX, the folder '/usr/lib/' is protected by
default and user libraries cannot be copied to that folder.
Alternatively, providing an option for alternative library search path
would avoid missing libraries during the deploy.
The addition of the option '-libpath=<path>' to macdeployqt adds a
search path for the dependencies. If a dependency was not found in the
provided path, the default folder for searching is used.
[ChangeLog][macdeployqt] Added option '-libpath' to search libraries in
a custom path.
Change-Id: I3afee6aaa3bc25521adecb91ec59d104e13834ed
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
So far winrtrunner was only capable of creating a package manually, not
to specify a package to install.
This can be very helpful for testing purposes.
Change-Id: Idecbea3c3413662a1f42f60fec60832eac7e7626
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|