Commit Graph

80147 Commits

Author SHA1 Message Date
Christian Stenger
73e80ca64f Squish: Start extracting runner process
Extract runner process partially into own class. For now only
the primary runners. Secondary runners will follow and later
more parts of the SquishTools will be moved over for better
encapsulation and easier enhancement.

Change-Id: I5db18cb8b27531a50f4284e42baa257755b7df58
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-26 14:30:08 +00:00
Marcus Tillmanns
414b95cb91 QmlJS: Reduce number of for loops
Removes some unnecessary contains() by using the QSet directly.

Fetch all required paths at once instead of calling generatedQrc(...)
multiple times.

Change-Id: I0a6f65d11d92a4ec4f6655a87e30df6a5c4d6545
Reviewed-by: hjk <hjk@qt.io>
2023-01-26 13:04:26 +00:00
Thomas Hartmann
03f9b2ecf6 QmlDesigner: Use simplfied type name to avoid ambiguities
Types can be prefixed with QtQuick. or <cpp>.

Task-number: QDS-8947
Change-Id: If2b1423d6a08a9e083f6abeeca62be690ce20d3e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 12:44:04 +00:00
Thomas Hartmann
751bb8df08 QmlDesigner: Use correct percentage for zoom
Change-Id: I9dfaf923a3387c3dd8bf080adca2ffcbafeab873
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 12:43:47 +00:00
Mahmoud Badri
0b8d2c15ca QmlDesigner: Allow dragging bundle textures to Navigator
Fixes: QDS-8338
Change-Id: Id5d02c4e5ed84f3592c19299b1d33dbe9b5cc486
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-26 12:25:21 +00:00
Samuel Ghinet
d1848912a2 QmlDesigner fix: Project style is configured wrong when filtered
In the "New Project" dialog box, if the "Style" section is filtered (to
showing e.g. only "Light" or only "Dark" themes) then the project being
created was configured with the wrong style. The problem was that the
index of the style was not "translated" from the filtered list to
normal list. This should have caused problems when saving the preset as
well, if the "Styles" section was filtered (to white/dark).

Task-number: QDS-8874
Change-Id: I9422dad3083f9bac3355bd65e1a71332d093271d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-26 12:14:35 +00:00
Christian Stenger
982ae8e690 Update perfparser submodule
Change-Id: I2a6e5987250f746c7d51228b4ec48d7911cf2506
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-26 12:11:49 +00:00
hjk
1d73bfcd37 QtSupport: Fix translation context
Change-Id: I84fd4827d95e28400ef5d84b3ba71f65dffe6c66
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-26 11:57:52 +00:00
hjk
bc6fc26951 QtSupport: Remove {Designer,Linguist}ExternalEditorFactory classes
... again, use the editors themselves, which are singletons.

Change-Id: I8ec7bce58414a23169831956c00bbdd73c6bfec3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-26 11:38:21 +00:00
hjk
66e932d284 QtSupport: Move Designer and Lingust external editors from qmake
To make them accessible also if the QmakePluginManager is not loaded.

The translatable strings are kept under "QmakePluginManager" for now.

Change-Id: I208ed7d3c8a003c930bd00501c7f64968b64681a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-26 10:08:13 +00:00
Thomas Hartmann
309ffbab59 QmlDesigner: Add enablers for QML exposure to ChangeStyleWidgetAction
Add static helper functions that can be used by the QML backend.

Change-Id: I4635d1ce0b7ca852ac013c782727f0bd14fd4dbe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 10:00:43 +00:00
Thomas Hartmann
a51941db31 QmlDesigner: Implement styles in the status bar
Change-Id: I8413394484dc9d19e1bbe64391cefaba0f976f94
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 10:00:32 +00:00
Thomas Hartmann
656eb38432 QmlDesigner: Add preview zoom menu to top toolbar
Change-Id: I4b47a36a75d90fed010ec347228cd9328913fb8e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:31:06 +00:00
Thomas Hartmann
20ede7e1fa QmlDesigner: Implement showZoomMenu()
This allows to show a menu for the preview zoom from QML.

Change-Id: If42ee78e7d3208cb8e8313a77e0d24a3f5409a47
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:30:53 +00:00
Thomas Hartmann
8972858014 QmlDesigner: First iteration of status bar
Change-Id: I085ae1d31a2eb6801f193558bf03905ce70bd435
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:30:39 +00:00
Thomas Hartmann
9c13bd8d9b QmlDesigner: Allow to enter project settings from QML
Change-Id: Idb79bf6bb088c985a7e786e3058761577ccb189c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:29:57 +00:00
Thomas Hartmann
a64e7b5c26 QmlDesigner: Cleanup members in ToolBarBackend
Those members are not used.

Change-Id: I3ff7b88be3084928ec5a2f26763530261337ac45
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:29:35 +00:00
Thomas Hartmann
f252584daa QmlDesigner: Disable context menu on toolbar
The context menu can hide the toolbar and we do not want this.

Change-Id: I74274458f09af1a4d38b5f3f395dcc3ece5befa0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:28:14 +00:00
Thomas Hartmann
5bb6dde12b QmlDesigner: Extend ZoomAction for use in QML
We have to keep track of the index independetly from the widget
and emit emitZoomLevelChanged().

Change-Id: I646fcb1eee10fe502a642b3be75f47888ff814ee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-26 09:27:42 +00:00
Thomas Hartmann
dcc5d875f0 QmlDesigner: Add option to open combobox upwards
Change-Id: I2abbee4886a1a35e5b43d0bdab02fb18310f0fc3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-26 09:26:33 +00:00
Marcus Tillmanns
94dd5a157b Utils: Let copyRecursively create target folder
Previously FileUtils::copyRecursively did create the target folder,
FilePath::copyRecursively now does the same.

If either src or target are .qrc paths, select the fallback copy
routine, as tar cannot read or write to a .qrc folder

see: 7cb74e325f for report about
failing test in testProject_multipleBuildConfigs

Change-Id: I52bb9ad8f018f359f598e5bc8b18ab31c901496f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-26 08:23:19 +00:00
hjk
1285b80c40 Utils: Use an enum indication the possible abort of an dir iteration
The bool is not really clear.

Change-Id: I4ce6412736aec6b1853fd53d4e535ad045748350
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-26 07:38:21 +00:00
hjk
4cf0918b5c CppEditor: Use more FilePath in BuiltinEditorDocumentParser
Change-Id: I839d6b5fb158dc75f12b200135a09b74050a94da
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-26 07:31:48 +00:00
hjk
570fa165b9 Utils: Remove use of one FilePath::toString()
Change-Id: Ie3f9d3c86806f85b31e30103b3e093ba677fe730
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-26 07:28:46 +00:00
Thomas Hartmann
fecd361483 QmlDesigner: Add missing tooltips
Change-Id: I90f157e6396733a6c6b7f9ccee052cdb5e30e291
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 18:40:42 +00:00
Jarek Kobus
bd9f4c3b8f TaskTree: Init with member initializer list
Make more members const for clarity.

Change-Id: Ie2f5451fc578a88b473231348465d40aece6a634
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-01-25 16:01:13 +00:00
Jarek Kobus
8e35048782 TaskTree: Remove TaskNode's start guard
Simplify internals a bit. Inline some simple getters.

Change-Id: I5f9ad63383acad9a16dd5f41f48b028abd9650a8
Reviewed-by: hjk <hjk@qt.io>
2023-01-25 16:00:07 +00:00
Eike Ziller
a89d1e5958 Build: Don't add QT_RESTRICTED_CAST if QT_NO_CAST is already set
as directory property.
It is not allowed to set both, but perfparser adds QT_NO_CAST_FROM_ASCII
as a directory property now.

Change-Id: I6dbc8911521c737dd38c58777b8cd785e8cfe135
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-25 15:04:47 +00:00
Thomas Hartmann
efd7d26e85 QmlDesigner: Add setting for the template merge
Usual user will not use this functionality.

Change-Id: Icef1ac07d204336f684e5a22a112ccd55eacced0
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 14:31:55 +00:00
Christian Kandeler
f49f9b43da ProjectExplorer: Give Xcode clang higher priority than "bare" clang
If Xcode is present, we want its toolchain in the default kit, rather
than a generic compiler from /usr/bin.

Change-Id: If5d1dc02b6abcfff580162a19f07706d58681b7e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-25 13:24:27 +00:00
Christian Stenger
2b64232eba SdkTool: Fix qbs build
Change-Id: I176cfe634ce8561b92a83e4e3f39b9531aa4f7f8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-25 13:16:13 +00:00
Eike Ziller
e9b177db7d Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/libs/utils/filepath.cpp

Change-Id: I04761cf7c99ed67322a592cbd0ae48c1ae9c708a
2023-01-25 14:11:01 +01:00
Henning Gruendl
b40e4960ce QmlDesigner: Fix current workspace emit
Change-Id: I0a83a5632946aaecdfa1eee796ea1c88006fb5ab
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 12:56:02 +00:00
Thomas Hartmann
f35e8f64dc QmlDesigner: crash fix
Change-Id: I02f6416832d6ed18b5c2d0cc4a0560ab2af6d11e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-25 12:12:27 +00:00
Henning Gruendl
742b0d9e1b QmlDesigner: Fix click outside TopLevelComboBox
Fix click outside of TopLevelComboBox closing the popup.

Change-Id: I936e667a2a6f51e29b17933a6819c80f48c734de
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 12:11:30 +00:00
Tim Jenssen
43b8532982 QmlDesigner: get qmlPuppetPath by duplicating settings
This should be a temporary solution. Read settings
at two different code locations is error prone.

Idea is to introduce a general QmlDesignerUtilsLib which can handle that.

Change-Id: Ic670d2c63f134ba8f1b1455d000b7c2f372b1d61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-01-25 11:44:34 +00:00
Tim Jenssen
c1380bee4c QmlDesigner: refactor get qmlpuppet path
Change-Id: If1e61bb24acf97215bb11987b0d68ed28ffacaff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-01-25 11:44:24 +00:00
Eike Ziller
f8638019d4 Update perfparser to master
Includes fixes for getting rid of FindQt5.cmake

Change-Id: I30a7bc814ec29807e8c07e4be5012f28df3b931a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-01-25 11:24:26 +00:00
hjk
f83038d245 QMake: Simplify ExternalEditor creation
Remove the intermediate inheritance level, clean up the fallout.

Plan in move them to QtSupport in a follow-up step.

Change-Id: I7fbecc7ea087b5f8e2c4bfbe97c2295957e454a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-25 11:01:04 +00:00
Thomas Hartmann
774c01d8b0 QmlDesigner: Fix template generation for exposed properties
Since recent changes in Qt the typenames are prefixed with "<cpp>."
and "QtQuick.".
Using simplifiedTypeName() fixes this, since it removed any prefix.

Due to refactoring the check for existence of the parent property
in case of a "sub property" like was removed.

"color.red" should only be added if nothing was already added for "color".

Task-number: QDS-8856
Change-Id: I6ef6bebf0674f8499c29e20f0313b78beb2b3282
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-01-25 10:55:53 +00:00
Henning Gruendl
5e7b97c7b4 QmlDesigner: Fix activated on TopLevelComboBox
Change-Id: Iedea97ff7837a1424cec872f66fd6e5861c74869
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-25 10:41:55 +00:00
Eike Ziller
26572bc982 qml2puppet: Don't rely on FindQt5.cmake
Use the normal CMake mechanism for finding either Qt 5 or Qt 6, instead
of relying of the mapping from Qt 6 to Qt 5 that is done via the custom
FindQt5.cmake.

As long as FindQt5.cmake still exists, we better assume that Qt5_VERSION
could be >= 6.0.0 though.

Change-Id: I3d095208e1608da46fe81d4db166aa0cd99c7326
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-01-25 10:14:34 +00:00
Amr Essam
2411dc818e QmlDesigner: update error message when adding incomplete effect
Task-number: QDS-8683
Change-Id: Id95b88b163fa898d0f0cf88a6f63009e944c1bca
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-25 10:04:29 +00:00
Marco Bubke
c719825927 QmlDesigner: Don't abort if any image is not null
So far we expected that both images are null or not null. But sometimes
you only want to save one image type in the collector. This will try to
generate the image cache entry again if you try to get a null image so
be careful.

Task-number: QDS-8917
Change-Id: I765f5b82589f52e439513a11926314ad2d99a928
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-25 09:56:36 +00:00
Tim Jenssen
93843458f7 QmlPuppet: fix enable preview in release builds
Since qmlpuppet is also used as QML runtime for the preview
QML debug channel this should be enabled in every build.

Change-Id: I0f9c10f1adf24f3db7da2389aa8a72e14b25433d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-25 09:37:30 +00:00
Jarek Kobus
18aebc785f TestResult: Change semantic for createIntermediateResultFor
Don't pass the other test result into createIntermediateResultFor().
Rename it to createIntermediateResult() and create a new result based
on this object. Fix the caller so that it calls
createIntermediateResult() for previously passed "other".

Change-Id: I2c87cee1daa4f400c867852d071bd5c91b84dfd5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-25 09:35:39 +00:00
Jarek Kobus
f9090dab0c TestResult: Devirtualize the class - part 5 of 5
Step 5 - implement createResultHook.

Change-Id: Ibe81fb93c8c1c12d1af458d0f9707d02864febd8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-25 09:35:28 +00:00
Jarek Kobus
2b99ba1db7 TestResult: Devirtualize the class - part 4 of 5
Step 4 - implement intermediateHook.

Change-Id: I2a0d921cc16b109fd6f72c3831d0564c761bb006
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-25 09:35:18 +00:00
Jarek Kobus
01828cfd8e tst_qtcprocess: Add testPipe
Change-Id: I5b54231d201960eb6909780e4a2c5b9860b7e523
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-25 09:34:34 +00:00
Christian Kandeler
455f9f6911 Update qbs submodule to HEAD of 1.24 branch
Change-Id: I38933e0ca016d31a0702b368c9b7ccd72741d3f1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-25 09:29:47 +00:00