Commit Graph

80529 Commits

Author SHA1 Message Date
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
Christian Kandeler
5fcf6fc5a4 CppEditor: Add more details to soft assert
Change-Id: I9b95d212344decc82cda20608e0a1166ab679754
Reviewed-by: hjk <hjk@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:27:48 +00:00
hjk
f74cb26598 ProjectExplorer: Use better FilePath conversion function in builddir
Change-Id: Id7c428390c15c410c3dc12eff18b1888174b1c64
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-25 08:23:04 +00:00
Marcus Tillmanns
7cb74e325f Utils: Add FilePath::copyRecursively
Change-Id: I0cb07158906a5e163ea35670f46f3b4fd9ec40b8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-25 07:29:52 +00:00
hjk
d57dd8462e Android: Use better filepath conversion for AvdPath
This is internal data, so to/fromVariant should do. However, the
device extra data is stored in settings, so stay on the safe side.

Change-Id: I2a673d4dc07b45d1b7b829796ad57540a5e49c20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-25 07:04:52 +00:00
hjk
15f33422cb RemoteLinux: Be a bit more verbose when rsync fails
Change-Id: Ibd049c67b5e6ab3d6526a35762f842819ef2f668
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-25 07:04:44 +00:00
hjk
2cbe7783de Android: Move strange macro to smaller scope
Change-Id: Ia53ba19eb2879d7b72677e28639e4f506581f213
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-25 07:04:24 +00:00
hjk
c93db0feb4 Android: Replaca a few FilePath::toString() uses
... with more appropriate options.

Change-Id: I47e5c6e629b095cbcb66968352718166f8748daf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-25 07:04:14 +00:00
Thomas Hartmann
444f620b05 QmlDesigner: Crash fix
Change-Id: Icc8df1d66bd739399c5b8a0248deaef7269432b1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-01-24 19:33:18 +00:00
Alessandro Portale
b73d6f3be8 Android: Read NDK and api versions from modules/Core.json
Qt 6.5+ writes the NDK version that was used for building Qt into
modules/Core.json. With this change, Qt Creator, now reads this version
and (if present) prefers it over the respective NDK version defined by
Qt Creator's own sdk_definition.json.

The order of preference for an NDK version being required and used for a
Qt version is now:

1) NDK that was manually set as "Default"
2) NDK defined by Qt's modules/Core.json
3) NDK version defined for a Qt version by sdk_definition.json
4) Default/fallback NDK version defined by sdk_definition.json

Task-number: QTCREATORBUG-28629
Change-Id: I2a0a9b3a1719139dc937d468e1dd3643289510a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-24 17:15:11 +00:00
Thomas Hartmann
2e334303fe QmlDesigner: Add top level toolbar
* Added Designer\TopToolBar=true to .ini to enable toolbar
* Added backend to CrumbleBar
* Added crumble bar
* Added QML toolbar
* Disabled original toolbar in DesignModeWidget
* Added callback to DesignerActionManager
* Added id to ZoomPreviewAction
* Dock Manager is exposed in DesignModeWidget
* Added new version of icon font

Change-Id: I8c8ad16137c84229854a1d0fa6dfdf498edf4253
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-24 17:13:54 +00:00
Thomas Hartmann
1b0a3c71b7 QmlDesigner: Show stacked container options only if selected
Change-Id: I89722c057768660316db5329f90e8c178505ddc5
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 16:32:27 +00:00
Thomas Hartmann
5a21976765 QmlDesigner: Show signal dialog only if item has slot trigger
Change-Id: I0a21d2ac6cc770b39d95f735c3ddeb01bcb225f5
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 16:32:15 +00:00
Miikka Heikkinen
04e1dd05c8 QmlDesigner: Fix eyeball tooltip
Fixes: QDS-8859
Change-Id: I5558984e90e88fcc16946ae8c52a43635730f5be
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-24 15:39:40 +00:00
Miikka Heikkinen
3070ca4fd9 QmlDesigner: Change focus to 3D view on drop
Fixes: QDS-8830
Change-Id: Iaeff4768fbc4bd37223bccce72e40234752cad40
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-24 15:39:24 +00:00
Eike Ziller
06c4df37b9 CMake build: Remove usages of Qt5_VERSION
and remove checks for Qt < 6.2, since that is our minimum version.
Except for sdktool and qml2puppet.

Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-24 15:35:46 +00:00
Eike Ziller
f37aa909ac sdktool: 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.

Change-Id: Ia9a17d82edfb2f27e10918f05ce8a0d34d9bb5f8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-24 15:35:37 +00:00
hjk
4e29a1efde ProjectExplorer: Code cosmetics in runcontrol.cpp
Change-Id: I880c9c9521209c9df26998086d63ff4e7638ee13
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 14:52:12 +00:00
hjk
d6fb9754ca QmlJS: Proliferate FilePath use
Change-Id: Ifd009ef9c6e15506d173727e84dda966d79bdb01
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 14:15:36 +00:00