Commit Graph

88653 Commits

Author SHA1 Message Date
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
9c5831dc80 TaskTree demo: Tweak the done result instead of nesting a Group
Tweak the return value of the TimeoutTask instead of nesting
a Group with conditional workflow policy.

Rename TaskWidget::isSuccess() into desiredResult().

Change-Id: I3d6f703427f13e8feb6d6db97c07b8b9f8b261a6
Reviewed-by: hjk <hjk@qt.io>
2023-11-20 08:27:17 +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
Eike Ziller
fd256b57de German translation: IncrediBuild
Change-Id: I9b801fe83b681551b123ce167a34ec44249a8bd6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-11-20 07:15:52 +00:00
hjk
d924d4e886 Fossil: Delay-create FossilClient
By three liens, the connect in the pluginprivate ctor
will create it.

Change-Id: I23c80884f293fae434de573b8684bde2c56bd45e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-11-20 07:13:39 +00:00
Eike Ziller
8116aaaab8 Fix missing wizard after loading CompilerExplorer without restart
Wizards should be reloaded after plugins are loaded. They might either
add wizard paths, or wizards that check for plugins might be loaded even
though they were not loaded before.
Emit PluginManager::pluginsChanged when plugins are loaded at runtime
too, and connect that to clearing the list of wizard factories.

Change-Id: I79e0fb4991074cba592296620f1758136d60b378
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 07:12:10 +00:00
Eike Ziller
b60fd77fc1 Fix clearing the list of wizard factories
Clearing the list of wizard factories did not result in updating the
available JSON wizards. The JSON wizard paths were scanned only once at
startup. Instead partially revert back to before
1cf6b031cf and let the JSON "factory
creator" parse the directories and return a list of wizard factories.

Change-Id: Ifc253479973be801c5323588800bb264610187b6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 07:12:00 +00:00
Eike Ziller
4362318c14 WizardFactory: Early return in clearWizardFactories
Detect early if there is nothing to do

Change-Id: Ic2c27c2d265cbc245d383531ad7d844457ea8121
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 07:11:46 +00:00
hjk
34f374baec Todo: Move TodoPlugin class definition to .cpp
Change-Id: I5b82b14bf86655f0dab9379effb4ff156900b610
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-20 07:07:02 +00:00
Christian Stenger
9b429c7ebd ImageViewer: Fix build
Remove now superfluous moc include.

Change-Id: Id0d0a4110e4be9206bd09a4795ebc63b7b443221
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 06:37:50 +00:00
Jarek Kobus
c8541962a6 DeviceShell: Get rid of unused variable
Change-Id: I8f93364b347460b1daef1149d3ff5c28436b0754
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-20 06:31:25 +00:00
Cristian Adam
48a3a12b01 CMakePM: Add failure logging for add|rename|removeFiles
Task-number: QTCREATORBUG-29914
Change-Id: I404a3efb8cabafba6036eb1bc07d19f18af17cd8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-17 21:09:31 +00:00
Alessandro Portale
8798ed1ace ProjectExplorer: Fix sorting of file names in subpaths in wizard summary
In the wizard summary page, on Windows, the sorting of files in sub
directories is not correct. The paths got converted to userOutput before
they were tested for '/' and then assigned to a FilePath (which caused a
QTC_CHEK warning in addition).

This is reproducible with the "QDS compatible" Qt Quick application
wizard.

Fixes: QTCREATORBUG-29921
Change-Id: I45b623409831b21467e33481dcc3ca557f0f9afc
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-17 20:08:38 +00:00
Henning Gruendl
5316586a0a QmlDesigner: Fix popover position
* Remove chevron

Change-Id: Icd27f26e75c09561b2ec5fb8cf1f80dad7dd5b86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2023-11-17 18:45:56 +00:00
Henning Gruendl
84cf414a1a QmlDesigner: Fix color editor details model
Task-number: QDS-11268
Change-Id: I043c5a4144778d29c54df9e448a86c855270f427
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 18:37:56 +00:00
Thomas Hartmann
48c1d9466c QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for EffectMaker
Change-Id: I233d1b39cc336beb18a837cbba26605528876e63
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-17 18:09:56 +00:00
Thomas Hartmann
c09635e850 QmlDesigner: Use QML/Designer/UseExperimentalFeatures44 for ModelView
Change-Id: I4de7c2c0b64cbdda65d5258168b72fe13f6dbd07
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 18:09:34 +00:00
Jarek Kobus
9d44d1899d TaskTree: Fix Timeout activation
The activation of one timeout may cancel the other running
timeout. Don't remove all timeouts which are to be activated before
the activation loop. Remove and activate incrementally instead.

Change-Id: I6147fb63b6ef9d6ada034330d98d1c13419012b4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-17 17:09:25 +00:00
Jarek Kobus
73bff6d497 TaskTree: Fix TimeoutTask ordering
Make ordering separate for each thread.
Add stress test for it.

Change-Id: Idb42ce2511b18c0e9dd4dcb216ca39b35b5c980e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-17 17:09:19 +00:00
hjk
43f1281674 Qnx: Use new setup scheme for most factories
Change-Id: Ie6154d816fb9d77948d73416b43bb933a56f6bbb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 17:08:35 +00:00
hjk
65dbc1eaf6 ImageViewer: Use new plugin setup system
Change-Id: Ie2178c6b38a0b122ab225bae30ea25e1c57b73ad
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 16:53:21 +00:00
hjk
3b05a6f58e FakeVim: Merge Plugin and PluginPrivate classes
There were different from the PluginPrivate-created-in-initialize
pattern anyway.

Change-Id: I690c9c0511203f3c4d6ec9eeca85c0a277330e2f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 16:48:46 +00:00
hjk
bde92e035e FakeVim: Move plugin class definition to .cpp
Change-Id: Iac485bbd6cd00ddfae189a6f82c9f5f2c7e9aaf9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 16:47:38 +00:00
hjk
d1aaebc3b4 FakeVim: Move test declaration from plugin to separate object
Also ugly, but differently.

Change-Id: I832ac19c7d8a3457a40baaae60653a02a32dbd75
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-17 16:36:19 +00:00
Aleksei German
9a8fa56a66 QmlDesigner: Fix for Style ComboBox
Task-number: QDS-11257
Change-Id: Ie50b9f585914c8f6345d61a8e6c5347998b3fc63
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-17 15:10:18 +00:00
Thomas Hartmann
32e9f3cfd4 QmlDesigner: Rename boolean to bool
boolean is not a QML type and Qt 6.5.4 does check this.

Change-Id: I09055cfecf8f91766c8c4f2806150fefa7301741
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-17 14:28:42 +00:00
Ali Kianian
18461884e0 QmlDesigner: Fix the bug for overriding Final property
Task-number: QDS-11301
Change-Id: I11a9941a344f7091405bd8e4cd5de10bf66c6c2e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-17 13:26:01 +00:00
hjk
15e499df06 BareMetal: Dissolve baremetalplugin.h
Split test so they can be closer to the implementation,
move rest to plugin.cpp.

Change-Id: I30310f5b2658ac669d219c2978c6a3d6c9d8b107
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 13:09:30 +00:00
hjk
c4c561556d BareMetal: Move DebugServerProviderManager closer to new setup system
Change-Id: Ic8029b0436d4c0e86e0f707632139a2074b296eb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 13:08:40 +00:00
hjk
7c7abec04f BareMetal: Use new setup scheme for various factories
Change-Id: I62f17efb8241acbfa954c07b0fa6f088990be7a2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 12:59:51 +00:00
hjk
fc1325d6c9 BareMetal: Use new setup approach for toolchain factories
Change-Id: Ic91ccab925f054d80fbfa8bc018b3e86d207b186
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-17 12:59:40 +00:00
Christian Stenger
4101260f41 Utils: Update mime type for linguist files
Use new mimetype used inside freedesktop's definition. The old one is
still used internally as alias.

Change-Id: If8405c109a1bfb326db84f480d35bc62625358a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-17 12:56:15 +00:00
Christian Stenger
f06b821f58 AutoTest: Fix handling of critical messages
Fixes handling of qCritical() messages or similar and
silences a soft assert.

Change-Id: I74f485ffd75b65170c2c9752bd774401c0f19734
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-17 12:55:43 +00:00
Thomas Hartmann
8932f9d462 QmlDesigner: Add try/catch block
There seem to be rare cases in which this fails.

Change-Id: I229a9a72394ec25dca1a9cdae0b51aa36291be94
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-17 12:54:47 +00:00
Christian Kandeler
d05d6f2469 Update qbs submodule to HEAD of 2.2 branch
Change-Id: I56bfc87909d6b73b90243371c30138be9fcff6ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-17 12:35:54 +00:00
Jarek Kobus
07f5c7638d TaskTree: Hide more API of GroupItem into protected section
Rename TaskXxxHandlers into InterfaceXxxHandlers.
Rename CustomTask::[Setup/Done]Function into Task[Setup/Done]Handler
to conform with Group[Setup/Done]Handler.
Fix the CustomTask::TaskSetupHandler type.

Change-Id: I0c69fc75622eb8324278f713db22a6de314d44ef
Reviewed-by: hjk <hjk@qt.io>
2023-11-17 11:35:23 +00:00
Jarek Kobus
ea5195afff Translations: Update Polish translations
Change-Id: Ibd4f5736eceed9c2eee4f8e4b6efa17d4b33e539
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Patryk Stachniak <patryk.stachniak@scythe-studio.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2023-11-17 11:27:02 +00:00
Jarek Kobus
20752a7811 Translations: Clean update of Polish ts file
Change-Id: Id4ec2377443b8fe42fa51f38c63a7a6c3bd6e6ee
Reviewed-by: Patryk Stachniak <patryk.stachniak@scythe-studio.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-17 11:26:52 +00:00
Christian Kandeler
89d9a481e2 Revert "QmlProject: Fix crash"
This reverts commit 4d55d6be18,
which broke all project loading.
The crash was properly fixed elsewhere.

Change-Id: I49f42dce1d7f69d6a1c3c769dc6a1399f26650d5
Reviewed-by: hjk <hjk@qt.io>
2023-11-17 11:26:40 +00:00