| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: Iaeca1396d6057cc92a75f376934edfb03213ebcd
|
| |
| |
| |
| |
| | |
Change-Id: I2633ab242f193aa0aaa79cadba250bd8d9842924
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I09a09fb14b3cf8d5486e84413f9f3238c72e2d0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
%1 contains line breaks and bullets. Having quotes around it is pointless.
Change-Id: Iced4bd6efcf60b1005fcd560ea773e208a0df997
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-19620
Change-Id: Ieb7a8bc8cfeb8ba4331436ef6652437c0971c356
Reviewed-by: hjk <hjk@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-20723
Change-Id: Id7e6700e87b73c845a0dda6152731085eaf5fcf1
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-19620
Change-Id: Icca654714b70c69522b51998be21cff80bc29fac
Reviewed-by: hjk <hjk@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I13737f490a7e4b46319fcae99f641a9bc8538184
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I49a73b83b1b6857c34913db8f7c6818cf7a1a129
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
To HEAD of 1.12 branch.
Change-Id: I632c2f804ab333ba88211219d2fe3e8c246b3ebe
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8d806aabcf2c744165553f087831ce899db24d80
Reviewed-by: hjk <hjk@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I9c0530b9b108277781dc937bd97cc2b7f68de122
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
They are also used by the qml code model, and may be used by additional
code models in the future.
Change-Id: If216cbeb7b77be0f3b6f31671c71d913206315cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
clang-tidy fixes from modernize-use-override check.
Change-Id: Ia9785ef4d5d236d9740abec26359495eaea2fad1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Color types and enable Ctrl+click for the functions
and types inside SIGNAL/SLOT macros.
Change-Id: Ic1c0b7372fe9a73c5607b1973d75a6656c75ef0e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Otherwise they can't be deployed to Boot2Qt (and other) devices. Quick
application wizards already have these deployment rules.
Task-number: QTCREATORBUG-20358
Change-Id: I5a19ada3f6a382e8553750769478c398a50352c9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Color "SplitterColor" is neither a named color nor a valid color
Fix-up for: 98e26dc6fb91f3d083d028cb85d468258dac3f55
Change-Id: I2d3749a06850e4c630d6a0392e6a1c6e2a75258f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I01aea1d0bceeeb5f8942d79d234d674e3173ccfc
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtQuick 2.11
QtQuick.Controls 2.4
QtQuick.Window 2.11
Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
This avoids issues with deferred properties.
Change-Id: Ie9cc0eaa3468bcb21e4817f8c5e3c1b97c8fc99c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I8e25cca4553a8b69703ac0ffa80231f97cdef980
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-20249
Change-Id: Idc17fcbda34273b4f29f0da0b01eddcd4f83c52d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iaa42a5e7fa1b58bf77f05ea04fcb997b647f474a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
* Remove unneeded #include that might lead to false diagnostics
* Fix typo
Change-Id: I38a3bbe07dbcb33f004c7b7a2a4ca4a90fb77350
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I5541214ca8aa518a59d0fa6563e59f69f8048eda
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ifa41cbff552c61cac47f09faf5e96dba8734e3fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
We define some fonts in pixel size and those have to be increased
if the pixel density is high.
Change-Id: I88e932d967aaa9d8757e733048d457e9e7c17f5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Qt Quick Designer synthesized a few theme colors from existing theme
colors. That was in order to prevent the need for 6 theme colors being
defined in every theme. It turned out, however, that being able to
define these if favorable.
Todo in follow-up commit: remove QmlDesigner::Theme::qmlDesigner...()
functions, and fix up the qml, accordingly.
Change-Id: Ica85df5472cd7b9da8bf215eb6dbdcf608a4fb2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
...otherwise not all intended diagnostics can be demonstrated.
Change-Id: I2f69862cc6c8a2e58059d9075ad6fd7c7e72b4a5
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
No real damage, the parser on the Creator side is apparently robust
enough. Still no need to add this.
Change-Id: I8329a55c44f866070fb3df48c3a22000ee33e848
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Make the hex display work with LLDB, fix GDB and LLDB test.
Change-Id: I529b5cdc908dbcba7270bc4574fa59a012fcacad
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Apparently changed in qtbase dafa3618d23.
Task-number: QTCREATORBUG-19812
Change-Id: I70f543c71cc2147cbd5ab33a070e1a35049f46a8
Reviewed-by: David Schulz <david.schulz@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/android/androiddeployqtstep.cpp
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/gettingstartedwelcomepage.cpp
Change-Id: I126823f5f60613509520c07f52be7bc9d4f4367c
|
| |
| |
| |
| |
| | |
Change-Id: I8960605dbf5a06ae4cce0e965103e67505e0434b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|\ \ |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/cmakeprojectmanager/cmakeproject.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/ios/iosrunfactories.cpp
src/plugins/nim/project/nimproject.h
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
src/plugins/qmlprojectmanager/qmlproject.h
src/plugins/qnx/qnxrunconfigurationfactory.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/winrt/winrtrunfactories.cpp
Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Instead of using undefined objects pass the needed objects around
to access them inside the JavaScript file.
Also update deprecated function use.
Change-Id: I4c0cafc319047d0b72a0f9310e5335f793f800ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I0837b8830735f80dd98928769e603907226ab6e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In some cases items render their children directly using an effect.
In this case we do not want to hide the children when calling
refFromEffectItem().
If the hint takesOverRenderingOfChildren is set in the .metainfo hints
for a parent item we forward a flag to the puppet and refFromEffectItem()
is not hiding this item,
Change-Id: I37a8c0ad8a15bc914c220e03b1b744779431d655
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic59eaaeec67f8aab71faec4e47910fc6755d7f6e
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: Id0f0110ac427b3a6460eeae2891cd1c5c65fc6a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
add forgotten $$.
amends b795cc152c0.
Change-Id: I39f9e2846bebaf88db98a1abf641f31dbe0025d4
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The infinite recursion occurs because we call QFileInfo::exists()
even if no change/fix is done, if a file in a resource if actually
missing.
If fileName != fixedPath the ":" prefix has been replaced by an
absolute path and a new call to ::create will early reject.
Typically the directories do not match, so nothing is replaced.
This crashed without the fix.
With the fix we will always remove the ":" prefix
and therefore we do not try to handle the "fixed" case.
Even, a broken path that contains multiple ":" we would
only handle a finite number of times until all ":" are fixed.
Change-Id: Ie13cedc1212bb58a16c61e0137128539d189269d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I0e8dc5a345f5a33a0f925f8a3dfe169c6d70e2a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Types information for qbs is more limited that qml; this causes
qtcreator to raise false positives. This patch relax the checks and
provide some type information needed by qbs files generated by the
wizards.
Task-number: QTCREATORBUG-19757
Change-Id: I07a1dd9d8fedaf4c5c751c2f00643f15ae39127a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8c439f87c30b4b4102f0839cc745120568e6f34f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/helpmanager.cpp
Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
|