Commit Graph

76686 Commits

Author SHA1 Message Date
The Qt Project
be9f6fea9b Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-10-04 13:45:23 +00:00
Tim Jenssen
964f539e55 Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp

and compile fix in materialbrowserview.cpp

Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
2022-10-04 13:44:42 +00:00
Christian Kandeler
eccbfc9459 LanguageClient: Allow to not pre-select non-project files for renaming
In alignment with what we already do in CppEditor/ClangCodeModel.

Change-Id: Ic68eca1879ed06887d3c5e39a09982bdd8c61065
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-04 13:11:43 +00:00
Marco Bubke
47887da778 QmlDesigner: Forward default value in settings
Change-Id: Id60a8ff569a15212b410f73ab707e5e37a3ca5a1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-04 12:58:41 +00:00
Eike Ziller
90900fc952 UpdateInfo: Ignore multiple update check requests
The existing code would kill the currently running process, but

- It's unclear why it should do that. If the user wants to cancel the
  currently running one, they can do that in any case.
- The existing code killed the current maintenancetool, but did not
  cancel the task in the progress manager.

Task-number: QTCREATORBUG-28236
Change-Id: I06c2d6b733d637e38cae120dc1a375f7952bfa85
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-04 11:55:44 +00:00
Jarek Kobus
993fd2a92a VcsBasePlugin: Use FilePath::relativePath
Instead of QDir::relativeFilePath().

Change-Id: Iacd25e51dc87b987402ff3677f6705c6e0e8edbf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-10-04 11:51:40 +00:00
Jarek Kobus
c666c93882 VcsBasePlugin: Use more FilePath
Change-Id: I7bc80245b093b210439efdf3ea353b52b288dcc0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-10-04 11:51:20 +00:00
Jarek Kobus
34f9229eef VcsOutputWindow: Use toVariant() when storing FilePath
Amends 4edb238073

Change-Id: Ied6f2d9fd78a40f70393eae1c685198ab119e575
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-10-04 11:51:11 +00:00
hjk
4f2b15679d RemoteLinux: Allow remote linux build devices as opt-in
... by setting QTC_ALLOW_REMOTE_LINUX_BUILD_DEVICES=1

Registering compilers and cmake on such devices already
works manually. [Note: The remote file dialog is extremely
slow when browsing remote directories]

After that, opening a CMakeLists.txt on the device works,
but not much more.

Change-Id: I19025930699f6aec57d26a36b3fb04109fbf03e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-04 11:42:46 +00:00
Mahmoud Badri
dbbed3dc68 QmlDesigner: Fix property groups missing on new project creation
Fixes: QDS-7469
Change-Id: I97809f1e143e92374c72e9fc58f2440742cbcc71
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 11:31:45 +00:00
Mahmoud Badri
18fd37e331 QmlDesigner: Expand material browser sections when searching
Make sure material browser sections that have matches are expanded while
searching.

Fixes: QDS-7836
Change-Id: Ie30c5425e8efee65cc4bdfa473b269841e73a9d3
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 11:30:08 +00:00
hjk
0d079bcf02 Utils: Remove unused #includes in theme.cpp
Change-Id: If9f032414d1b16c15482fc0eb7f804021e561a17
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-04 10:50:39 +00:00
hjk
09fb8d403b CMake: Use correct device environment for remote cmake binaries
Change-Id: Id2fccab7f2d051406b0f2b0bbf3c118198f6ed32
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-04 10:47:00 +00:00
hjk
3b84a408df CMake: Allow parser to run remotely
Change-Id: I3953d459177790fd652ab69c083b0dd0f1d29031
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-04 10:46:51 +00:00
Mahmoud Badri
9dda372b7a QmlDesigner: Fix material browser context menu open issue
Allow opening material browser context menu when search is empty.

Fixes: QDS-7837
Change-Id: I473b62d1f1b94a42d5c60f0e06a6d2b76b74ca6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 10:19:57 +00:00
Christian Stenger
7020efffbb Squish: Request application settings if necessary
When recording a test case and the suite.conf does not specify
the AUT to be used ask the user to specify the application
and its arguments.

Change-Id: I01aa96e16d4abc763aa4be7ddb285601e81f7a01
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-04 09:57:27 +00:00
David Schulz
33177686fd TextEditor: do not replace nbsp with normal spaces
This fixes saving documents and copy texts that contain non breaking
spaces.

Task-number: QTCREATORBUG-17875
Change-Id: Ie0b0e68cf7d67e768ff99c9acae1937aafc78ce7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-04 09:52:35 +00:00
Alessandro Portale
78ef2e2b52 WebAssembly: Convert to using Tr::tr
Change-Id: I7fb420363884236ebd7eeb589a29a475f8911915
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 09:31:38 +00:00
Jarek Kobus
898053533a ProjectExplorer: Limit the usage of qMakePair
Make the code less verbose.

Change-Id: If9fe08a6a7538d34c80ca97a2aec21a2bd6e5d22
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-04 09:02:22 +00:00
Jarek Kobus
50f2f57f6a ProjectExplorer: Limit the usage of std::make_pair
Make the code less verbose.

Change-Id: I4d671a49a6b8097d4a324bdd9f6a2c9dbdb225cc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-04 09:02:18 +00:00
Christian Stenger
aedd50eeb7 Squish: Fix wrong condition
Change-Id: Ic816a96202de710d1ff011ec489f066f98d2f7e5
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-04 08:51:17 +00:00
Jarek Kobus
95e54055ef Clang: Limit the usage of qMakePair and std::make_pair
Change-Id: Ida094760023047ecb8ba29e60d5e81f766981b65
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-04 08:45:28 +00:00
Jarek Kobus
93dc9ce591 QbsProjectManager: Limit the usage of qMakePair
Change-Id: I00cf4e3608d275051c142ab574a47ff4688c7970
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-04 08:09:33 +00:00
Jarek Kobus
7eb778dc3d Theme: Limit the usage of qMakePair
Change-Id: Ibc47dfc4f48ab1b3bc2fe77b353d13d1e22d8b8f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-04 08:05:22 +00:00
Jarek Kobus
43f3b70437 QMakeProjectManagerPlugin: Limit the usage of qMakePair
Remove unneeded Utils:: scope.

Change-Id: I9d42aa2005214004b91686168e2bcaa420354a6c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-04 08:04:05 +00:00
Jarek Kobus
4857a58fdd GitLab: Limit the usage of std::make_pair
Make the code less verbose.

Change-Id: If938923022f8bcdb2559328e03035b8b38145f3e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-04 08:00:24 +00:00
Leena Miettinen
eeb1cd22ce Doc: Describe new Text Editor > Display preferences
- Visualize Indent check box
- Tint whole margin check box
- Update the screenshot.

Task-number: QTCREATORBUG-27876
Change-Id: Ie61cf82e35f8dda75e0aeea08eda92993ff36a71
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-04 07:32:59 +00:00
hjk
23e96dd6fe Utils: Use a single QString as data store for FilePath
Plus a few integers to get access to the pieces.

This reduces sizeof(FilePath) from 72 to 32.

Change-Id: I65eb856ad47b6a250c705d8d01893781a21d8e02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 07:27:16 +00:00
Mats Honkamaa
599c882057 Doc: Update custom property documentation
Task-number: QDS-7735
Change-Id: I1f4551e6d5f1319c73bc6e1b05c3c0390feecda9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-04 06:38:10 +00:00
Mats Honkamaa
7d3593fc4a Doc: Add timeline animation tutorial
Add a tutorial describing how to use timeline animation and
binding animations to properties.

Task-number: QDS-6460
Change-Id: I99a586842f6cc6fe3acb0785757eb1d2de86df54
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-03 11:19:54 +00:00
Jarek Kobus
604730f14d CleanDialog: Use more FilePath
Change-Id: Id545b8c412d55d8e1976cbe0bbdad36e22eb93a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-10-02 19:04:58 +00:00
Robert Löhning
f5c725cf23 Restore object names lost while inlining
Amends 715e5800a5
Amends e070d826e5
Amends f3bceeda53

Change-Id: Ifafc0b79fc751696443d1b1288d3a272851445b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 18:16:02 +00:00
Jarek Kobus
b6c8ce20e6 WebAssembly: Limit the usage of qMakePair
Change-Id: If4bdf567cf0dd1e01cbe41971f2d47ebc06a1d65
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 17:30:15 +00:00
Jarek Kobus
b885281ce7 Android: Limit the usage of qMakePair
Change-Id: Ic079174e75d3a538d5d97fc3931ddd035623f4a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 17:30:09 +00:00
Jarek Kobus
c09c7ccba0 Differ: Fix broken logical XOR
I bet the intention was to do logical XOR operation.
In cpp it's done with operator!=().

Amends: 24a25eed14

Change-Id: Idfc5dbf09b4f4b6c81aa237a956d5d4e04155c09
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 16:52:12 +00:00
hjk
efbab2e7c4 CMake: Be a bit more specific on what is not reachable
Change-Id: I5d521a9562d36850c264e1af48b46e16c642fde9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-09-30 15:31:16 +00:00
Jarek Kobus
5ab100a2b9 CMakeProjectManager: Limit the usage of std::make_pair
Make the code less verbose.

Change-Id: I8dc194f0cb4ed38c4c117482a7011019444edc40
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-09-30 15:12:34 +00:00
Jarek Kobus
55efe40a58 Vcs plugins: Replace foreach with ranged for loop
Change-Id: I9be29ef128f49f62a6e1f450d8c5277b467310e9
Reviewed-by: hjk <hjk@qt.io>
2022-09-30 15:09:42 +00:00
hjk
8640e00447 CppEditor: Proliferate FilePath use a bit
Change-Id: I7e2669c3adf5de39804da2bf06d99f5ae03447dd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 14:56:08 +00:00
Miikka Heikkinen
f2b2f488e2 QmlDesigner: Fix mouse position on material browser to 3d editor drag
The mouse position from Edit3DWidget needs to be mapped to Edit3DCanvas
before resolving the 3d position.

Fixes: QDS-7840
Change-Id: I85bc1e9268d6f683382a5431997263429ea13470
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-30 14:55:05 +00:00
hjk
57b32ed773 CppEditor: Inline cpppreprocessordialog.ui
Change-Id: I2941e6fd3da93d1a71fb7d98e6d39634ae957d42
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 14:52:12 +00:00
hjk
5ff70b6f99 ProjectExplorer: Introduce an IDevice::usableAsBuildDevice
Better approach than whitelisting ids from leaf plugins.

Change-Id: Ida7e23d7ea02eb76d7de4049737f2cb0fad2b9d7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-30 14:38:47 +00:00
hjk
4b1f1cb335 CppEditor: inline clangdiagnosticconfigswidget.ui
Change-Id: Ic0800378b31eac71c743cda13e7306c0c1131129
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 14:34:33 +00:00
Jarek Kobus
f65c42c797 Various plugins: Limit the usage of std::make_pair
Make the code less verbose.

Change-Id: I22ceb8d74567d78042f537b185f8e504227c24c6
Reviewed-by: hjk <hjk@qt.io>
2022-09-30 13:37:52 +00:00
Miikka Heikkinen
243e473b4c QmlDesigner: Fix timeline check when committing dynamic property value
Timeline has to be recording for us to care about it at value commit.
Otherwise, if there is timeline but it's not recording, we end up
with soft assert and losing the dynamic typename, which causes
isDynamic checks to fail later on that property.

Change-Id: Ib63467ecc4fca1d14409d3c68bb3a5fcd13c10ce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-30 13:14:05 +00:00
Christian Stenger
60d78e4bb0 Squish: Cancel wizard early if settings are wrong
Add an error label for the user and stop internal actions
to avoid displaying error message dialogs with less helpful
information.

Change-Id: Ie0d075121fabb56b67300eaf6c0ebde674475b9c
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-30 12:46:54 +00:00
Leena Miettinen
bea4dd861d Doc: Describe new locator options
- Open as Centered Popup
- Triggering all kinds of actions with the "t" filter

Task-number: QTCREATORBUG-27876
Change-Id: I6aebe62726fae9ba68d4f841cce6ee4cf7434747
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 12:46:36 +00:00
hjk
b1e8772848 CppEditor: Inline clangbasechecks.ui
Change-Id: I630f794377936139eade42f56a8bd46175e84143
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 12:39:29 +00:00
Jarek Kobus
8a645e8a1d GitPlugin: Limit the usage of qMakePair
Change-Id: I9a164d951c43a9fc30bbdfffada22d9876d35e3f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 12:27:12 +00:00
Marcus Tillmanns
34dc092642 Docker: Improve File contents read speed
Change-Id: Ic94715d2c362ac3aa75dabf4f95c74737abd6264
Reviewed-by: hjk <hjk@qt.io>
2022-09-30 12:13:52 +00:00