Commit Graph

86167 Commits

Author SHA1 Message Date
Christian Stenger
7125862212 Add some include guards
Change-Id: If306f95f206e2b1cba48df806c822b8e2d27cf72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:58:36 +00:00
hjk
7e38745706 Qnx: Re-order code a bit
Change-Id: Id2da2bdc67edd1abcc489767392aa791c7b0f667
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 13:57:08 +00:00
The Qt Project
5fc4751736 Merge "Merge remote-tracking branch 'origin/12.0'" 2023-11-21 13:56:30 +00:00
Tim Jenssen
701d4b2146 QmlDesigner: fix crash
Task-number: QDS-11300
Change-Id: I1fe6966445284e3e9ca5596d8f5ec866f37acc39
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 13:51:56 +00:00
Eike Ziller
c75a3bcd5d Merge remote-tracking branch 'origin/12.0'
Change-Id: I0ee9c73d7a7e12f98f88b161c35d00ada069cc9d
2023-11-21 14:46:01 +01:00
David Schulz
72a8e2e644 Python: fix pdb debugging
The pdb engine is created in the DebuggerRunTool constructor so we
cannot unconditionally overwrite the engine in DebuggerRunTool::start.

Amends 9af8ecd935

Change-Id: I0c3c88d14235bfb01543da788a7bb5e7e99018d3
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-11-21 13:43:24 +00:00
hjk
b9a0481a0d HelloWorld: Use ActionBuilder
Change-Id: I2e0c9de2293640712669c273e3b307ac95340fd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:39:13 +00:00
hjk
08bf118624 Qnx: Move QnxSettingsPage to new scheme
Change-Id: I96287f7dc2b0d12f85164c137d1f1e6701ce468e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 13:38:31 +00:00
Serg Kryvonos
8608dc9556 Use "Ninja Multi-Config" generator by default in configurePresets
Multi-Config generators have additional library dependencies checks.
Xcode and MSbuild are multi-config generators too.
We need to make sure it kept configurable.

Change-Id: I571e718bc71ffc3920f07d15a956e9153d74b0a5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-21 12:14:50 +00:00
Miikka Heikkinen
77678c7bce EffectMaker: Add clear all nodes button
Fixes: QDS-11335
Change-Id: I5d0e0e11baabe780c19234410814a9f6eb45130d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-21 11:36:23 +00:00
Henning Gruendl
659772baa4 QmlDesigner: Fix navigator column width
Fix the navigators column width for Qt 6.5.4 and at the same time make
the icon columns tighter.

Task-number: QDS-11314
Change-Id: I87397eca104e4bfb835090229672e2d3d42dee6e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 10:28:27 +00:00
hjk
96dcd41d41 GenericProject: Use new setup pattern for ProjectFilesFactory
Change-Id: If5d64a8d6b09fbd3ceaea1736ce74ba2c837a456
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 10:19:48 +00:00
Tor Arne Vestbø
4f9cf826d6 Detect iOS 17 device development status via devicectl
iOS 17 devices no longer report the development status via
the com.apple.xcode.developerdomain domain.

Task-number: QTCREATORBUG-29682
Change-Id: I9de3c88425b71906f51d0f0e8b6a4ece0e08eb3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 09:55:55 +00:00
Ali Kianian
54c9a38baa QmlDesigner: Fix the build error for CollectionImportTools
Change-Id: I946df14af3e4425203ea7ea04807205442c3119d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 09:54:10 +00:00
hjk
181b362fcf Core: Use more ActionBuilder in EditorManager
Change-Id: I5d1330536c0a6f60185a2e62fad35599f6e5698f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 09:41:16 +00:00
Mahmoud Badri
b14037f537 QmlDesigner: Add clearList icon to icon font
Change-Id: Ib60120dccca106e723d7eb2fe21ef574de62605a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-21 09:04:46 +00:00
Miikka Heikkinen
10792b1eb3 EffectMaker: Fix effect node deletion
Now the correct node is deleted.

Fixes: QDS-11330
Change-Id: Id7402ea6b4f258d32e851de2118e53f26a6c632a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 08:50:47 +00:00
Christian Stenger
3fdea38f58 EmacsKeys: Use SPDX License header
Change-Id: Ief2367d0d7cfae8e20b29b511bd87db348051b4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 08:46:38 +00:00
Christian Stenger
102a3474e0 AutoTest: Fix coverity warning
Coverity-Id: 1360896
Change-Id: Icd284ec2b227eec314ec340c201b3fe4baeb529b
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 08:46:24 +00:00
hjk
5a3261f15a GenericProject: Code cosmetics
Compactify genericprojectwizard.cpp a bit.

Also, rename GenericProjectWizard to GenericProjectWizardFactory and
GenericProjectWizardDialog to GenericProjectWizard. That's what they are.

Change-Id: I9a7ac55b047cc9e40cb0c4f7f25bc6239686bf99
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 08:46:22 +00:00
Christian Stenger
50b9e601b0 LanguageClient: Fix coverity warnings
Coverity-Id: 1569380
Change-Id: I925ef9f154f1d4c39d7631a7a94f37be4735aa8c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 08:46:16 +00:00
hjk
b18b156c71 GenericProject: Consolidate project wizard related classes
Change-Id: I61dcd07c27b8d691d8623eaec5d1d0a5fdb96608
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 08:46:12 +00:00
hjk
72cdbbb8da ProjectExplorer: Check for accidentally deleted workers
... before checking for re-run support.

The workers are own by the RunControl, they should not self-destruct,
but this apparently happens.

Change-Id: I41101dfc20bf2ff4f19c440934e4d4010a88c04e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:58:37 +00:00
hjk
b86ca0947b QmlPreview: Fix double deletion of RefreshTranslationWorker
The RunControl takes ownership of its RunWorkers.

Change-Id: I720d4404f991651de5d5f7906fbea96f0e4e20ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:11:41 +00:00
Christian Stenger
fef6986fa8 TextEditor: Fix Qbs build
Amends b26c43f133.

Change-Id: Ib2dcee8280c1a91f7a8ade344fd43c4ecd787775
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 05:49:15 +00:00
Alexandre Laurent
6e219addb2 Update French translation for QtCreator 12.0
Change-Id: I41ac396ad9cd2b12dff4258278e1384adeda6377
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Olivier Delaune <olivier+qt@delaune.info>
Reviewed-by: Johnny Jazeix <jazeix@gmail.com>
2023-11-20 20:11:11 +00:00
Eike Ziller
e33c15c75d Qt Quick/DS wizard: Fix the QML import path
The wizard builds custom components to a "qml" subdirectory, which the
QML engine is told about in main.cpp, but we need to tell the code model
too, with a QML_IMPORT_PATH cache variable.

Without this, the QML editor shows errors for the module imports.

Change-Id: Ie48e809e2d51cc796c6c6c186a81c67e23a3609b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 17:02:56 +00:00
Alessandro Portale
400dee55ef CMake build system: Push some plugins "dependecy levels" up
The higher the "level", the more dependencies. Some plugins from that
level have less dependencies than their level indicates and can "move
up".

Change-Id: I2735162ab0b64096f21bc025e3d6ecc7427a5bf4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-20 16:14:36 +00:00
Artem Sokolovskii
b26c43f133 SyntaxHighlighter: Move static functions to other namespace
- Created HighlighterHelper namespace and static functions
were moved there from the highlighter class

Change-Id: Ib93785a3819317d7c1d5cc480652d4635cb9339b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 16:04:59 +00:00
hjk
e53308eb7d Haskell: Use ActionBuilder to create action to run ghci
Change-Id: I7bb4064a06e91b580c1d5f72dc4f0ff2ab8ef0cd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:36 +00:00
hjk
8c3a1c7e5c Haskell: Move haskell project setup closer to new setup pattern
Change-Id: I3c6e6ad1a6f4b0a8d0a5598ad970c7539d1643e3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:27 +00:00
hjk
e6b052e040 Haskell: Use new setup for run related classes
Change-Id: I9c6324aea586838d83bf81098499627c8c6c6d4a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:17 +00:00
hjk
cc711d7903 Haskell: Use new setup for HaskellEditorFactory
Change-Id: I537248460291d5d649a1dc60a5f495003d76fa8b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 15:56:03 +00:00
hjk
f0574fdb9b Haskell: Use new setup pattern for HaskellBuildConfigurationFactory
Change-Id: I4b8598157a8be20d3447dc7c4e3196700ec3d490
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:55:53 +00:00
Ali Kianian
96ddb5da8b QmlDesigner: Remove the options from adding model dialog
Task-number: QDS-11234
Change-Id: I064d2fed81a8f2592cfefae2c603b2d790b6bfb3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:59 +00:00
Ali Kianian
9a55e5c3de QmlDesigner: Import a model to the default JSON model group
Task-number: QDS-11312
Change-Id: Ib97273a15db4c7fb46ed01debf99602b71ec7630
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:52 +00:00
Ali Kianian
16e06a0af0 QmlDesigner: Move the action for adding a collection to json
The action should be moved to the tool menu of the Json Collection

Task-number: QDS-11256
Change-Id: Ieb2c9cc4f4b992f1ac3225bbbd90e3d14afdc711
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:42 +00:00
Ali Kianian
42405ffa74 QmlDesigner: Fix the bug for saving collection
- The node resolved path was wrong.
- Also the saving method is cleaned up.

Change-Id: Ic905c20e5899fcc23c97a8d42a1fdf7c0c8e1089
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:33 +00:00
hjk
e28110f6fd Haskell: Use new setup pattern for StackBuildStep
Change-Id: Id78047e755a3419499d804ada3edb7ec75fa61d1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:06:49 +00:00
hjk
2b88b514da GenericProject: Move plugin class definition to .cpp
Change-Id: I4da63d3d106431d7d0c8976e8d1705e40a68646c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:01:03 +00:00
Ali Kianian
a5a1152a76 QmlDesigner: Support having diffrent url types by the collection editor
Task-number: QDS-11222
Change-Id: I94aac8a6cc5eb86d338b02a24886388188dc5def
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:56:51 +00:00
Artem Sokolovskii
52f4c66b7e SyntiaxHighlighter: Move VCS highlighters creating to TextDocument
Change-Id: I531b30d31fb630d2292eaf4d8c61ff1e95fed460
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 14:52:39 +00:00
Artem Sokolovskii
4bfc3476f4 SyntaxHighlighter: Move highlighter creating to TextDocument
Added setSyntaxHighlighterCreator function to TextDocument
which allows the creation of highlighters inside TextDocument.

Change-Id: I454f800c878c48a154dad5abd68b7a4f9ceb378a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 14:52:20 +00:00
Miikka Heikkinen
9d0fd52a7c EffectMaker: Fix combo box open/close behavior
Fixed inconsistent opening and closing of preview and add effect popups,
when clicking on the content part of the combo box.
Also, pressing Escape now closes opened combobox popups.

Fixes: QDS-11307
Change-Id: I3b3fddbaa743c77fd60833378ab809b17a8f1a84
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:52:17 +00:00
Miikka Heikkinen
af656a3b53 EffectMaker: Fix copying asset files during export
Fixes: QDS-11290
Change-Id: I54d7f618bcf1bed44d105ceb4e48fd6820d6b6ea
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:52:04 +00:00
Ali Kianian
414649e385 QmlDesigner: Remove the export popup
Task-number: QDS-11242
Change-Id: I3ef24a41e58162eeb34fcf0f220d5854410fbb73
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 14:51:39 +00:00
Miikka Heikkinen
38205996af EffectMaker: Add the default image to UrlChooser combo for image values
Fixes: QDS-11221
Change-Id: Ib788c6950c9fc59fd87e199ab6c54bdd274cc8a2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-11-20 14:51:02 +00:00
Christian Kandeler
b8c2be4cf8 CppEditor: Hide CppRefactoringChangesData
Change-Id: I5d88651a9b3a295bd95de5ee5e9b117e449195b3
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-20 14:39:05 +00:00
Christian Kandeler
ac952955a4 TextEditor: Clean up RefactoringFile interface
Change-Id: I1e415b6b51065d16bc49a25118931723b600c00b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-20 14:38:51 +00:00
Christian Kandeler
cf74409bac TextEditor: Introduce PlainRefactoringFileFactory
This makes it immediately clear that there are more specialized variants
available, which helps users make a conscious decision.

Change-Id: I35feb4bed2d91fb4f83ede6e731d9ce89fd4af3f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-20 14:37:37 +00:00