Commit Graph

72811 Commits

Author SHA1 Message Date
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
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
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
Christian Kandeler
78b9edd251 TextEditor: Rename class RefactoringChanges
... and remove outdated comment.

Change-Id: I6dcd0a38608192ccdd6734affd33e170d39e8299
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-20 14:37:19 +00:00
Christian Kandeler
e7073421cc TextEditor: Remove RefactoringChanges::createFile()
Dissolve into only caller.

Change-Id: I2eaac8bf31c0ecd2dfb863b7fae79af557ccad95
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-20 14:35:51 +00:00
hjk
fabef397f9 Haskell: Move plugin class definition to .cpp
... and simplify setup a bit.

Change-Id: Ic5a36c35c083232cb8df3c7a06aaac46bcef55e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-20 14:06:46 +00:00
hjk
18bbffddb4 Proparser: Silence compiler warning
/data/dev/creator/src/shared/proparser/proitems.cpp:226:17: warning: variable 'totalLength' set but not used [-Wunused-but-set-variable]
            int totalLength = sz - startIdx;

Change-Id: I64028926c5af69d2692c977d60c233b5404712ed
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-20 13:49:13 +00:00
Mahmoud Badri
e740bc076c EffectMaker: Load effect nodes from share folder
Change-Id: Ie7b1c95d6eb277c01310d9badc1b755e0517385c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-20 13:46:04 +00:00
David Schulz
d81d41032a TextEditor: do not collapse doc comments in the beginning of a file
The auto fold license header functionality also automatically folds
documentation comments. Automatically collapsing documentation comments
is never correct in the first place so just skip the fold when encounter
a documentation marker in the first comment.

Fixes: QTCREATORBUG-29900
Change-Id: If0dd7842804f3ff0bcd725b54413e9568d5b5ab3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 13:39:30 +00:00
David Schulz
b451019be1 Android: enable "Toggle Comment Selection" shortcut in manifest editor
Fixes: QTCREATORBUG-29818
Change-Id: I8434ea99d8f5c5dc3c0436f5313d42084aca4152
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 13:27:13 +00:00
Christian Kandeler
f163a4f9a1 TextEditor: Move more code out of RefactoringChanges
The only callers are in RefactoringFile, so put the functions there.

Change-Id: I94141d759d32c20a334804e98dfeb262e10c5e11
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-20 11:56:47 +00:00
hjk
1dafa53b3b ProjectExplorer: Fix a warning
er/dependenciespanel.cpp:260:14: warning: private field 'm_project' is not used [-Wunused-private-field]
    Project *m_project;
             ^

Amends 0de9d31e84.

Take the opportunity to make the model a proper member to save an
indirection.

Change-Id: I10b14d54571c6c3960b2ff74522afe2729930630
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 11:01:48 +00:00
hjk
01cecddce7 FakeVim: Fix warning about unused lambda capture
Change-Id: I136f52002e02611d41a309809408bcde57aceefe
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 10:22:59 +00:00
Christian Stenger
c5980a4872 CMakePM: Fix build
Avoid ambigous conversion, instead explicitly convert.

Change-Id: I1b62a8eb94cc2c353b33ec1a29a28385fdb92782
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-20 10:19:53 +00:00
Miikka Heikkinen
a2b195580b EffectMaker: Fix popup geometry
Effect Maker preview and node combo box popups will now stay within
the screen boundaries of the screen the parent combo box belongs to.

Fixes: QDS-10512
Change-Id: Ibbfb706499c4b17e27ff5ae471fef8bb9f7384cb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 09:41:13 +00:00
Eike Ziller
458beb8582 QmlDesigner: Hot fix for settings crash
Change-Id: I05d27fb2dee65c50191e7dcd7c7bf8f195bb46e5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-20 09:23:51 +00:00
The Qt Project
3e71f99dd6 Merge "Merge remote-tracking branch 'origin/12.0'" 2023-11-20 09:05:34 +00:00
Leena Miettinen
3f9f249c0d Doc: Add a readme.md for using recolordocsicons.py
In preparation of moving the instructions for taking screenshots
from the Extending Qt Creator Manual to a QUIP.

Change-Id: I034185e7ab4878cf36766db1e9a6b8de5d2b3fed
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-20 08:58:50 +00:00
Eike Ziller
1c4de485da Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib09af70f157a6c7d6cbda4e3de678fd2bbceb229
2023-11-20 09:48:43 +01:00
Jarek Kobus
20d82c48b3 ScreenRecorder: Fix closing namespace comment
Change-Id: I078543dcf3e4ba005427988a0b74ee30ce751ee5
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 08:27:53 +00:00
Jarek Kobus
39e39408b2 TaskTree: Get rid of StorageBase::isValid()
Not used and not needed.

Change-Id: I3ba4b86c57c1d3d6ecf5999e16d79142d50d8a07
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 08:26:19 +00:00
Jarek Kobus
ce80a6dad5 TaskTree: Rename TreeStorage<> -> Storage<>
This addresses the 20th point in the master task below.

Task-number: QTCREATORBUG-28741
Change-Id: I696beda87430fbe637abba8054012fb77516e220
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 08:25:50 +00:00
hjk
9800f1bdc4 Revert "ImageViewer: Fix build"
This reverts commit 9b429c7ebd.

There is a Q_OBJECT in line 12, the #include is needed.

Change-Id: Ia4d333b6419bb2bdcdcf124d22d0473f6fd91cb1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 08:01:01 +00:00
Jarek Kobus
767bb30b11 TaskTree: Hide more internals inside StorageBase class
Rename storage internals.

This addresses the 20th point in the master task below.

Task-number: QTCREATORBUG-28741
Change-Id: I1ed42472060de6180d4665d6504598adb57828fe
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 07:48:04 +00:00
Jarek Kobus
ced3052e7f TaskTree: Get rid of Storage subclass of GroupItem
Make the c'tor of the GroupItem taking the TreeStorageBase
public instead.

This addresses the 20th point in the master task below.

Task-number: QTCREATORBUG-28741
Change-Id: I78320ec24b4e4b915ab549135fb93b45c658b9f2
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 07:47:54 +00:00
hjk
69aa92159c GitLab: Access GitlabParameter singleton more directly
Change-Id: Ib4d333b6419bb2bdcdcf124d22d0473f6fd91cb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-20 07:28:11 +00:00
hjk
d9b8702d57 ImageViewer: Code cosmetics
Change-Id: I946d1f0ce9be10f1f31441ac7f0b7fa7216b70db
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 07:24:40 +00:00
hjk
11d5fbe04c ImageViewer: Move Viewer class definition to .cpp
And de-pimpl.

Change-Id: I2c4acc95a7d583b4bfbc98bee3c989425d9306c1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 07:24:28 +00:00
hjk
8aa78b119a Fossil: Move plugin class definition to .cpp
And split out the tests into a separate class.

Change-Id: I908c4cec5d6a69850867cf2e51c050c8dd356a26
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-11-20 07:24:12 +00:00