Commit Graph

67787 Commits

Author SHA1 Message Date
Miikka Heikkinen
6eee8aa99d QmlDesigner: Add 3d axis colors to theme
Task-number: QDS-2404
Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-11 06:55:09 +00:00
Orgad Shaneh
b9b725eafa QmlDesigner: Fix typo in Qbs project file
Change-Id: I989a3f491a8f5cfb26c513ead4f8121df327e09b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-11 05:54:31 +00:00
Fawzi Mohamed
b3df10c3b5 mac: fix touchbar delegate interface
Change-Id: I984801ffdfab797cdff9248c048ca4c1dd08ecf3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-11 04:38:39 +00:00
Robert Loehning
b5e0313f41 Target Selector: Fix numbering of placeholders
Change-Id: I05120f079599de696b94f4b52a4bb7d98a3d506f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-10 17:04:36 +00:00
Robert Loehning
0f7447e1b1 QmlJS: Remove redundant white space
Change-Id: Ic999c6ca85b8f5bbbc9d4a808805196006dbe60c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-10 17:04:26 +00:00
Tobias Hunger
2eb9e12b5d CMake: Use Qt5::DesignerComponents
QTBUG-75867 about missing Qt5::DesignerComponents support has been
fixed, so use that over our own hand-rolled version.

Change-Id: I6d8bb7f7d5359050f20a095adb4a074f143e8d49
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-10 14:52:01 +00:00
The Qt Project
0e8f62d5f8 Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-08-10 13:59:18 +00:00
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
2020-08-10 15:56:54 +02:00
Christian Kandeler
660b267193 QbsProjectManager: Disable build and clean actions during parsing
The qbs-specific actions such as "build file", "build product" and
"clean product" were not properly updated on parse status changes, so
they would stay enabled during a parse, leading to user confusion about
why nothing happened when clicking them.

Fixes: QTCREATORBUG-24129
Change-Id: Ia19052e287f0ce1d965332e8ccd9efb46c8d005e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-10 13:16:14 +00:00
hjk
b7738aaf29 ModelEditor: Make compilable with Qt 6
QMulti{Hash,}::insertMulti() is the same as QMultiHash::insert(), but
will be gone in Qt 6.

Task-number: QTCREATORBUG-24098
Change-Id: I4673a338e26a52e913e4fd17cb931e4de041227d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-10 13:13:33 +00:00
Eike Ziller
715aa04d33 Fix clazy-standalone deployment on Linux
For some reason the RHEL build of LLVM has ClazyPlugin in 'lib64'
instead of just 'lib'.

Fixes: QTCREATORBUG-24344
Change-Id: Ibfca2aabd4c25ad4d80ea0e56de5ca8692b3c7ae
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-10 13:03:27 +00:00
Marco Bubke
208ebd6043 QmlPreview: Fix crash at shutdown
Seem like it get a nullptr project at shutdown.

Change-Id: I76d9f4b2b90b0641d645cb413f9ebfe678bb1c9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 12:55:26 +00:00
Marco Bubke
e43c7fdb1d QmlDesigner: Split messaging and process for puppets
This will make it easier to implement custom puppets. The new connection
manager will restucture the code and it add a mechanism to capture data
too.

Task-number: QDS-2529
Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 12:53:30 +00:00
Christian Stenger
bf00fd93a2 GlslEditor: Robustify version detection
Change-Id: I91a702ecec151f8331139b21d9a1b8c0939e6e4f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-10 12:43:39 +00:00
Christian Stenger
256c239ad1 CPaster: Make dpaste use SSL permanent
Change-Id: I8c3238c2efcfac1e1a4cf718e09a2f862be85b9b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-10 12:37:35 +00:00
Christian Kandeler
7cd9699766 CppEditor: Fix following signals/slots in old-style connects
... if the first argument is a call to a function returning a pointer to
QObject.

Fixes: QTCREATORBUG-13265
Change-Id: I12c2d07331a0c6dca56ad55c518240fd74be3dca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-10 12:30:28 +00:00
Christian Kandeler
c6a56cce28 CppEditor: Do not omit the function return type
... when rewriting an argument of a refactored function.

Fixes: QTCREATORBUG-13698
Change-Id: Ifb569a290d3c46944d17a73a19400833e5ba7fe9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-10 12:07:54 +00:00
Christian Kandeler
d9eb3dc5a4 CppEditor: Do not re-indent existing code
... in "Complete Switch Statement" quickfix.

Fixes: QTCREATORBUG-12445
Change-Id: Ic168f5b434b81d2b5f5a0d344d6c6786a75d07a5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-10 12:02:11 +00:00
Christian Stenger
acadee710e ProjectExplorer: Do not pass invalid regex to match
Change-Id: I9917c9fa7a79132c253269efde90976e18f9b805
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-10 10:55:33 +00:00
Christian Stenger
84e4b3af31 Tests: Do not fail if boost compile fails
Change-Id: Iaa74f0c5911f328ca041a8f8e84c760187f6c38f
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 10:55:16 +00:00
Andre Hartmann
d273a5bc5f PathListDialog: Increase initial dialog size
Especially on Windows systems, paths can be long.

To avoid resizing the dialog on each open, just
make it larger by default.

Change-Id: I3803ee6f930e0c27f3d8841fff025d1641bb216e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-10 09:44:14 +00:00
Andre Hartmann
6d6938c69f CustomParsersSettingsPage: Add hint for enabling parsers
Change-Id: I55b16e8079ac4c3d495485ba23eb71b4ca2caec0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-10 09:43:50 +00:00
Marco Bubke
b5d59c75a7 QmlDesigner: Fix bool handling in the list model editor
Task-number: QDS-2581
Change-Id: I47a9ed4ca55532bb7199a6c5dd4894b7adb7d05d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 09:40:34 +00:00
Marco Bubke
b4027b7943 QmlDesigner: Fix crash for list view model
There was a type, so it crashed. The code is now under tests so we cannot
break it anymore.

Task-number: QDS-2563
Change-Id: I81426a9f8a568b217b7bf9c8c261b24be14ff61a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 09:40:26 +00:00
Marco Bubke
97cc02b781 QmlDesigner: Fix typo bug
Change-Id: I074beda7dc5fa6dc2775e764983bf72e17ea90cf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
2020-08-10 09:40:15 +00:00
hjk
2bda74b46f Incredibuild: Do not rely on metaobject classnames for build steps
The preferred interface are step ids, #include'ing other modules
*constants.h header is considered ok for siblings in the core
distribution and does not create run time dependencies between plugins.

Change-Id: I0421936068b459c1aea61e23310f860d8ed1f0d4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-10 09:33:14 +00:00
Christian Stenger
326cf1a982 Tests: Fix compile
Amends 52b2ca55c9.

Change-Id: I82b2ae8a353fc6ebe46e38956100fd3dce53fdf6
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 08:48:24 +00:00
Christian Stenger
63823a55ac AutoTest: Display relative path for file nodes
Using the full path for the file nodes may be quite long
depending on the location of the project.
Display its name relative to the project directory or the
parent group node instead.

Fixes: QTCREATORBUG-24374
Change-Id: I4ce57a0940008d99c51e63c2265a371a0ffe20ef
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-10 08:24:38 +00:00
hjk
f41f153882 Adapt qmljslexer to Qt base change caa40f57d4d
qstrtod is no longer exported.

This effectively reverts commit 149cc3af6 as it causes an explicit
dependency on private headers, leading to more problems downstream
than the implicit dependency using the declaration.

Change-Id: I93a9cfc6e440b20d6bed51504bb8004fd67f341c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-10 07:45:17 +00:00
Christian Stenger
c6c320a6ea Debugger: Avoid decoding error when fetching native value
Change-Id: I4cfe144c7d96134e373e6d6d6141eb05a7dfe911
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-10 07:22:02 +00:00
Orgad Shaneh
354f628052 Git: Filter out commits according to active remote
... in the Push to Gerrit dialog.

Fixes: QTCREATORBUG-24436
Change-Id: I2f1ab49d9fbeb09ffb66de23d34a2facd53cb725
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-10 05:51:33 +00:00
Christian Stenger
c25a40f6ed AutoTest: Fix possible crash
Do not access list items if there are none.
Amends 502ad9badb.

Fixes: QTCREATORBUG-24421
Change-Id: I2982f675bba36eac98cb116acf64472a9f415977
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 05:13:41 +00:00
Orgad Shaneh
bafc8381c6 CMake: Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER
Missed in commit 52b2ca55c9

Change-Id: I1f1862e5ad8fd5a29c3e0a56adbc7960e538f441
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 02:57:48 +00:00
Thiago Macieira
149cc3af6b Fix build with Qt 6: qstrtod is an inline function
Change-Id: Ib620871532484bcaa43cfffd1628d6bf0f93fd78
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-08-08 16:50:37 +00:00
Orgad Shaneh
be16ac2371 Git: Avoid translation of git commands
Fixes: QTCREATORBUG-24390
Change-Id: I9bb041045d6adf0ae91f6d22723846f058662275
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-08-07 13:32:14 +00:00
hjk
e04b9a5348 IncrediBuild: Rework CommandBuilder
Simplify interfaces. Also persist all command line settings,
make overriding default arguments explicit.

Change-Id: Ifb7e791dfc07ae9a88cfd769b9d21c5ee242e31d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-07 13:02:51 +00:00
hjk
f00b088a1d IncrediBuild: Finish buildstep aspectification
Change-Id: I7135ff47e4c117bf8917cfbd7c90b1e0ba527145
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-07 12:45:52 +00:00
hjk
52b2ca55c9 Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER
QT_USE_FAST_CONCATENATION doesn't do anything nowadays.

Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS
for QStrings and enables more QStringBuilder use for QByteArrays.

Change-Id: Ibd297817c50d86661d47822799f989447249af1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-07 12:45:03 +00:00
Miikka Heikkinen
32f71ca8ff QmlDesigner: Fix group selection for 3D scenes that have Models as root
Change-Id: If6ec2bcb4a4627fcf658e23f6998115a68718ee8
Fixes: QDS-2467
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-07 10:56:53 +00:00
Miikka Heikkinen
a774890a10 QmlDesigner: Fix default transformMode setting in 3D edit view
Change-Id: Ia918d05bf58d9460e25e9fa4dd592c68c03bd0cf
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-07 10:55:31 +00:00
hjk
e69d90bc1a ProjectExplorer: QPointer guard for OverrideMakeflagsAspect's widget
As for the other aspects.

KitManager::kitRemoved() triggers several actions in a fragile (wrong?)
order: BuildSettingsWidget::updateBuildSettings() after
Target::handleKitRemoval() already destroyed the target with all
configurations and steps.

Having a null there is fine.

Change-Id: I2e10826c12971a25ee4cbab24ef5327fa6e47499
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-08-07 10:44:29 +00:00
Christian Kandeler
68dcd02640 QmlDesigner: Fix various compiler warnings
-Wdangling-else
-Wdeprecated-declaration
-Wunused-function
-Wunused-parameter

Change-Id: Id655b6c9c043e2049e921b05619f596b3641bdbd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 10:21:36 +00:00
Thomas Hartmann
8b04c7ff0c QmlDesigner: Warn if no properties can be animated in transitions
Do not fail silently.

Change-Id: Id8470f8b81a75dc660906ed53538e75563068527
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 09:37:57 +00:00
Kwanghyo Park
50791a07a6 Change encoding to Unicode (UTF-8)
There is an error while build on the machine
which needs Unicode encoding for compile.
Most of the files are fine but not the fixed file.
So changed the files encoding to Unicode.

Change-Id: I8abb2471c26231c8d659dcacd99e71f8d255415f
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 07:49:32 +00:00
hjk
1ef9e72d64 QmlPuppet: Make compilable with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ia5fd2b74cf2cfdb149a3df9de9d5a47058d21c9e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 07:27:20 +00:00
Miikka Heikkinen
5343490eb4 QmlDesigner: Fix pivot point scaling
Now pivot point in 3D edit view will always appear same size regardless
of the viewing angle.

Change-Id: Iddd4fc8800eecbc63f16fc130b7f93dcba4d5d65
Fixes: QDS-2570
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-07 07:27:13 +00:00
Orgad Shaneh
61601899db UnitTest: Fix escaping of LLVM output on Windows
Complements 1929c38a9f.

Change-Id: I95e32baf477e42003f1e97c73fd557b480de33a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-07 05:01:04 +00:00
Richard Weickelt
9e1d6ca395 Update qbs submodule
To HEAD of 1.17 branch.

Change-Id: If128125a5e6a24efe7cdd523e133634e2bfe72d4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 18:51:57 +00:00
hjk
242af33430 ProjectExplorer: Use a real label for the extra BoolAspect checkbox label
And show a tool tip also there.

Noticeable e.g. in the "Incredibuild for Windows" buildstep checkboxes.

Change-Id: Iebabda6fb025596aa9dbc7c917c4bdbeb25a1a8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 14:41:21 +00:00
Miikka Heikkinen
d56d03e322 QmlDesigner: Don't highlight EditableListView items when not focused
Change-Id: I0897d57ad417f39fb72c6ce19c1349f8f6030c0b
Fixes: QDS-2416
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-06 14:29:51 +00:00