Commit Graph

66760 Commits

Author SHA1 Message Date
Thomas Hartmann
28022d8e04 QmlDesigner: Remove Quick3D dependencies from ModelNode2DImageView.qml
Change-Id: Idf19019dbeebf8f3f09309a724727a4aa643ce25
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-23 10:58:58 +00:00
Mahmoud Badri
2bf40dddfd QmlDesigner: Fix copy / paste bug
Fix a bug in calculating the scatter value when pasting an object. Also
some tweaks and clean ups in the same file.

Fixes: QDS-2982
Change-Id: Ic2847d03ccf03d188c5fbca2cd14bc74b9d20223
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-23 08:40:41 +00:00
Christian Kandeler
8d8473daf6 Debugger: Fix compiler warning in dumper test
Change-Id: I9f3633065890bb5e574fd688b39b0bc93a94c8b1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-23 07:22:50 +00:00
Christian Kandeler
c9c0e80339 Qmake: Fix wildcard expansion for absolute paths
Wildcard expansion for e.g. deployment purposes was implemented, but
accidentally only for relative file paths.
Amends 9e32603c3d.

Fixes: QTCREATORBUG-24695
Change-Id: Iab5c761ad68c2d4facecef5b44e6e50e66ed4941
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-23 07:22:04 +00:00
Christian Kandeler
c2913f65e4 QbsProjectManager: Do not cache incomplete environment
Retrieving the run environment for a qbs product can fail if the qbs
session is busy at the time of the call. In such a case, caching the
result will cause subsequent accesses to retrieve an incomplete
environment. This patch fixes the latter problem.

Task-number: QTCREATORBUG-24599
Change-Id: Ia0c6831cf371995ac8399d15e4dd93b8bb6e4f3b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-23 07:21:25 +00:00
Thomas Hartmann
98a649ccfd Fix crash for missing BuildSystem
There is no gurantee that a Target has a BuildSystem.
Target::additionalData() does expect a BuildSystem.

Task-number: QTCREATORBUG-24817
Change-Id: I41edf89fa6dbf6ed24a27129b8353a9506b7b176
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 13:34:09 +00:00
Orgad Shaneh
b1cd859219 VcsManager: Fix adding files to VCS from locator
The files are listed by file name without path, so git add was executed
from the user's working directory instead of the target directory.

Amends commit 48c56416f5.

Change-Id: Iba7c5ff33378265d3c22479d7abb6ccf8db75d07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-22 12:59:01 +00:00
Robert Loehning
89d36b418a Make Help mode Squish-testable again
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-22 12:44:54 +00:00
Eike Ziller
c510cf79d8 cmake build: Add option for exporting plugins
That can be used for external plugins. Just add the option "EXPORT" to
your "add_qtc_plugin(MyPlugin ...." call. Other plugins can then do
"find_package(QtCreatorMyPlugin)" and link against
"QtCreator::MyPlugin".

Supports both using a Devel install or using a build directory of the
plugin that is depended on.

Task-number: QTCREATORBUG-22803
Change-Id: I80724eca8c828d2d5be307d32f3125c4e3bd8b3a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:45:12 +00:00
Eike Ziller
e83e146d08 cmake build: Install our special FindQt5.cmake
Which handles the Qt5 vs Qt6 differences

Change-Id: Ie2e4d1c9564cd1d88c912b23c08a721e9e4e1b90
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:45:06 +00:00
Eike Ziller
067cb61c7c cmake build: Fix export name in case of branding
We must use the same name everywhere for the export name, for simplicity
stay with QtCreator, since this is not user-visible anyhow.

Change-Id: I4f51982534662d46401dad1320eec3758eed055b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-22 11:44:58 +00:00
Christian Stenger
860eeca6c5 QMakePM: Restore old system() handling to old behavior
Parsing qmake based projects without execution of system()
may lead to inexact parse result and can end up with unusable
projects.
Amends dd62254.

Change-Id: I7300a810c82959aab159d2492b4020998d26de38
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 08:27:17 +00:00
Henning Gruendl
73a26c0039 QmlDesigner: Update icon font
* Add pin and unpin icons

Change-Id: I42773d3f86f68d9bc638fa27500fb0b1b4e5d35d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-22 06:46:57 +00:00
Cristian Adam
ee735e308e GitHub Actions: Set timeout for running tests
Timeout of 5s for tests that do not have the TIMEOUT property,
and 600s for the whole teset suite.

Change-Id: Ie58f1ec2f657448a963bf51d6e93cad142603120
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-21 20:51:28 +00:00
Cristian Adam
79ed00e14d Update Qbs to HEAD of master
Fixes issues when installing via cmake --install

Change-Id: Ia4eb1ebabbdba24f15367710011da8400cd9706a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-21 17:33:56 +00:00
David Schulz
3b611e07f7 Debugger: prevent calling functions with gdb on windows
and adjust tests accordingly

Change-Id: I172e08cfccc248eea06a94208c9e8e312d69e334
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 11:15:40 +00:00
Christian Stenger
c9d2a8d69e AutoTest: Support QTest::addRow as well
Fixes: QTCREATORBUG-24777
Change-Id: I33ac86a226036855a304b71e2e7ebfe8884d8dc3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-21 10:16:04 +00:00
Christian Kandeler
b58ca33ff6 CppTools: Categorize the delete operator as a write access
... in the "Find Usages" results.

Change-Id: Ib399bf762c717b7d4439be26b9180574aefce7e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 09:12:33 +00:00
Christian Kandeler
135e76f965 CppEditor: Offer InsertDefsOperation quickfix for all classes
The check whether there are unimplemented member functions takes quite
long, so Creator would freeze for several seconds when right-clicking on
the name of even a medium-sized class.
Therefore, we offer the operation for all classes with member functions
and move the expensive check into the perform() method.

Change-Id: Ie19958ba8c53493be859f9982d7d5697e6e9d88b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 08:19:25 +00:00
Christian Kandeler
ed292f3f9b clangbackend: Categorize non-const pointer arguments as output arguments
Fixes: QTCREATORBUG-24550
Change-Id: Iac4f3b133a632d7272bfe4253f8a0740e51b0952
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 08:08:29 +00:00
Christian Stenger
cbf4e8af0a QmlPuppet: Fix qbs build
Amends 6b8d8e4.

Change-Id: I1bac4049478b87e12d7e0ea16d5e7450745c2952
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-21 08:05:42 +00:00
Eike Ziller
cc6f35016a Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I6aa2cb51dcbb4d76238a2ed8603bf57a35ee4fd6
2020-10-21 09:10:50 +02:00
David Schulz
0ca9ea353c Editor: Do not use disabled code color for right margin highlight
Fixes: QTCREATORBUG-17174
Change-Id: I68729d5a44b23fe46b810054a1dc472ffd63e272
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 04:32:27 +00:00
Miikka Heikkinen
6b8d8e414a QmlDesigner: Port 3D edit view to Qt6
Task-number: QDS-2899
Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 14:55:43 +00:00
Eike Ziller
49a8266d58 Update Qbs to HEAD of master
Fixes issues when compiling with ccache.

Change-Id: I3cb712b84f527eaf35649d207d5750fa698d46b7
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-20 14:47:54 +00:00
Cristian Adam
3c4f7967e3 CMake Build: Allow building unittests when targets are missing
when configuring a minimal build make sure that when querying
for target properties like SOURCE_DIR the target actually exists.

Change-Id: Ib754b79be6461e3ddd4cdeb1abac123cf4535068
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 14:12:54 +00:00
Cristian Adam
a2aa02acba CMake Build: Make sure testplugin target exists before setting property
When doing a minimal build, the testplugin might not be created.

Change-Id: Ia4f1cbd14cbdad6e81cb7090a7f52aad692175fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 14:12:38 +00:00
Christian Kandeler
2b5e1ea62e CppEditor: Fix some "convert to camel case" edge cases
Fixes: QTCREATORBUG-16560
Change-Id: I8573ae6c5dce0956c868addc69a921c62f1d571a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 13:27:54 +00:00
Robert Loehning
675a85bef0 QmlDesigner: Add missing include
Amends 3614ab81ce

Change-Id: Ib8a02fe5829462379ae9a665b5c0e8e8832cc090
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 10:57:13 +00:00
Mahmoud Badri
1a8c802f56 QmlDesigner: Remove Switchsplittabwidget
Removed the unused class Switchsplittabwidget from the codebase.

Change-Id: Idb0071d4e6bb54b6a08e6026f8768f9239a5c342
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 09:32:06 +00:00
Robert Loehning
15c9de9251 Squish: Update tst_codepasting
Change-Id: Ie908f0af267f420e107c06ae039bb085462f945d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 09:26:28 +00:00
Eike Ziller
3614ab81ce QmlDesigner: Fix incorrect conversion between double and int/long
And fix macOS build which complained that std::abs with doubles is
ambiguous (between int and long and long long).

Amends aaf564cab7

Change-Id: I87d4453afa4dda676cc27c219d7dbfc22fcee70a
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 09:19:34 +00:00
Alexandru Croitor
fb0db5c745 ProjectExplorer: Fix sorting predicate to have a strict weak order
Fixes random crashes when opening the 'Manage session' dialog.

Amends 8c0906e8fb

Fixes: QTCREATORBUG-24797
Change-Id: Ic3118163d1a9a10eacc1ea1cc90f54c86ac790d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 08:48:12 +00:00
Eike Ziller
08d84a688a Fix compilation of sdktool against old Qt versions
Amends 6c5eaed92c

Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 08:28:04 +00:00
Mahmoud Badri
83da45adde QmlDesigner: Remove AnnotationTool
Remove AnnotationTool from FormEditor's selected item's tools.

Change-Id: I797ed4002d14c04956aaeb5d779f1cf3f326f849
Fixes: QDS-2970
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 07:57:36 +00:00
Christian Stenger
05ecdba5d8 Tests: Fix compile and code
Change-Id: I2f2a8a4ff9e7bcd3138b93b177e07f2aa3850fcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 07:35:33 +00:00
Cristian Adam
ab8cda95a6 ClangRefactoringBackend: Fix build with Clang 11
Change-Id: Id03b0771e242534943e062dee3e63022ec9d9ce8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 06:57:35 +00:00
David Schulz
f220cb0e23 Revert "Editor: Make line spacing adjustable"
This does not work with text wrapping since there are multiple
QTextLines inside a block but we can not adjust the line hight inside a
block. This needs to be addressed inside Qt.

This reverts commit dc64f3207b.

Change-Id: If6c28056da9891eeeb75f5939a42f08360013a80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 04:35:42 +00:00
David Schulz
a962a08b1a Editor: fix completion character completions
Cleanup the proposal after an item is activated even if the proposal
widget is not visible anymore. Otherwise we might wrongly cleanup a
proposal that was triggered by a completion character while a completion
list was already open.

Change-Id: Ie95247de09313c5816cffd9a865b05183db02354
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:56:47 +00:00
David Schulz
b0d4414dfc LanguageClient: pass id as a const ref when handling client messages
Change-Id: I7ab6a7517d4dd0fe66f601661e7b3f6a7afb338b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:56:31 +00:00
Christian Kandeler
f72c2b84f7 Unittest: Fix qbs build
The image test uses unexported classes from QmlDesigner. Let's just
remove it.

Change-Id: I42cae90d7333bf1ad7f75839c93eef773cb5fab8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:34:18 +00:00
Knud Dollereder
aaf564cab7 CurveEditor: Fix bounding rect computation for the graphicsscene
Task-number: QDS-2957
Change-Id: I0019d538e7460e923b35024bd02f7186e1935f6b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-19 14:43:04 +00:00
Eike Ziller
b771f400de More change log for 4.14
Change-Id: I33de8128e19d530793f9af97f8eedb1ca03fec2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 14:38:17 +00:00
Eike Ziller
f21d0b531f Fix github actions for Qt Creator plugin wizard
For Qt Creator 4.13
- rename directory to 'workflows'
- use MSVC 2019 for Qt
- fix Qt Creator platform names
- don't use GitHub's now deprected set-env

Fixes: QTCREATORBUG-24412
Change-Id: Ifdd3e95da74fef4ad9f65ae2c084ff82b2ca1972
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-19 13:48:56 +00:00
Eike Ziller
436f111a46 CMake build: Fix build of QmlDesigner
Follow-up of d1b0c12d6b

Change-Id: I04491e815f8a8220c3719ca6bfdbf6de3e30b527
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-19 13:07:07 +00:00
Christian Stenger
6c5eaed92c Utils: Fix matching wildcards to full paths
Fixes: QTCREATORBUG-24792
Change-Id: I82b4edea6260b07e1bdff065b157a4cd044ec629
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 13:02:00 +00:00
Henning Gruendl
9f6eb972b7 QmlDesigner: Fix reversed order on Navigator drop
Task-number: QDS-2910
Change-Id: Iab58b79b6f3cdb3f922824a7f608b633b019c9ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-19 12:35:53 +00:00
Eike Ziller
4d39f2736f Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
2020-10-19 14:10:51 +02:00
Robert Loehning
91fb438b94 Remove invisible translated strings
Change-Id: If03c1e5d160d375e3a8ecd2c534214e3c92ae918
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 10:01:04 +00:00
Cristian Adam
d7e24f28ba CMake Build: Fix missing pythonXY.zip on MSVC
Ammends 94b9b33a17

Change-Id: I531a648a108233fbefbe6878f65f8ab7186db39a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 09:45:04 +00:00