Commit Graph

80509 Commits

Author SHA1 Message Date
Kai Köhne
1be357f4be Remove GPL-3.0+ from license identifiers, part II
The original text before the SPDX change did not include a potential
GPL-4.0, but GPL-2.0.

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR LGPL-3.0/LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only/g" {} ;

Change-Id: Id5e40d3e174ecea660a09e88a02bd57505f1875d
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 10:27:36 +00:00
hjk
1f4b6837ba Utils: Make TreeStorageBase related qHash and comparison hidden friends
Also, inline the hashing.

Change-Id: I75859ad5481ab673d6c6f233c6fe67a96f9cda45
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-06 09:57:01 +00:00
hjk
ce7b865cf7 QmlPreview: Robustify preview runner a bit
Don't rely on qobject_cast not returning null for eternity.

Change-Id: I0adede2f05a27e4f98ee47e737af38732f1e4c31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-06 08:47:13 +00:00
hjk
c7bb5fcc37 Debugger: Remove spurious waring
Task-number: QTCREATORBUG-27160
Change-Id: Ie69c60688249efcd4d2c2330d6555cf7f708edd2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 08:32:09 +00:00
Eike Ziller
adc874f690 COIN/GitHub: Use Qt 6.4.2
Change-Id: Ia66ce7e0a8ebf988c1af9888ddb7e9461f0cac05
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-06 08:28:17 +00:00
hjk
53f46e0643 QmlPreview: Have a dedicated run worker factory class
More similar to what the rest is doing or heading to.

Change-Id: I835ef19810cbce146d3ae22b3881c0e89d1b1fb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-06 07:59:02 +00:00
hjk
67195f4270 Valgrind: Use named classes for run worker factories
Change-Id: I05009aa2fe4541e10fa56a3a095db030e18b79b5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-06 07:16:25 +00:00
hjk
15d6e1df1b Debugger: Use a full class for DebuggerRunWorkerFactory
This continues the work started with de6c7696d2.

Change-Id: Ifc306347f2346909a9eba39c74449c559a7c2f76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-06 07:16:17 +00:00
hjk
2f6ac9d797 PerfProfiler: Use named classes for run worker factories
Change-Id: Ib91f307c69bd2b85626aedf958799417cdd354ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-06 07:16:07 +00:00
Burak Hancerli
fb14965dfe QmlDesigner: fix for coreApp initialization problem and loadwatcher scope failure
Change-Id: I7a82cdd32757a7d37a0e88fad3e0f83527e49094
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-05 20:18:39 +00:00
Sami Shalayel
dc67907679 Update the qml code model parser
Updates the qml code model from qtdeclarative dev
(commit: 164d8f66d82deea74464c68a2cdd19e5998835da).

Fixes: QTCREATORBUG-28238
Change-Id: I383c98012f1efd56110d43c258fa1b398a6f8255
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-05 15:25:18 +00:00
Jarek Kobus
4e58ffcd13 Task/ProcessProgress: Delete private data on destruction
Change-Id: I81787984ff8dbb541f88922c90e51a68184c392b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-05 14:49:01 +00:00
Cristian Adam
2f39b51bdc CMakePM: Make "Autorun CMake" a global setting
The "Autorun CMake" is only visible in the Tools settings page when
the user clicks on CMake tool.

This is not very visible and it doesn't have to be per CMake version.

Change-Id: I57ded0b2e6a3ecb731bb8bc1495b6b61bc04c8b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 14:37:50 +00:00
Jarek Kobus
2a2455a6fa Don't call FutureProgress::setKeepOnFinish(HideOnFinish)
This is the default behavior so no need to set it explicitly.

Change-Id: I7248a7a3890fa7fd947b8e42fccc70383d46ca3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 14:26:03 +00:00
Jarek Kobus
45c98836a9 ProcessProgress: Add setKeepOnFinish()
Change-Id: I327cf309081d432b11a85bd98bc9f42de65313da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 14:22:42 +00:00
Jarek Kobus
fdb9cb905b QMakeStep: Use TaskTree for running qmake step
Change-Id: I8737a0fe3f8857db4e171001a73adde842d05d44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-05 14:14:59 +00:00
Jarek Kobus
acd55c0677 AbstractProcessStep: Provide API for running TaskTree
As an alternative to calling AbstractProcessStep::doRun().

Change-Id: I53142b7470a3e2aed0e219300fb3e0b4621630db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-05 13:53:13 +00:00
Miikka Heikkinen
ac93351c93 QmlDesigner: Respect node locking in navigator and 3D view
If 3D scene root is locked, disable create options from context menu
in 3D view.
Also, don't highlight locked nodes as drop targets in navigator.

Fixes: QDS-8731
Change-Id: If0c8b5497781c2623f2c57966d4689e345b85785
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-05 13:39:26 +00:00
hjk
c022f53b88 QtSupport: Consolidate Qt version macro expander setup a bit
Change-Id: Id8f08d335beb3f6aef682b84f62cd9bdb50dd057
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 13:25:23 +00:00
Alessandro Portale
4e0b4fcc92 QtQuick Application wizard: Add "QDS style project" option
This adds a checkbox labeled "Design Studio style project" to the
Wizard. With that selected, the project is generated via the "General /
Empty" templates of QDS with Qt 6.2 as target Qt version, 1920x1080 form
size, the "Material" QtQuick.Controls style ("Light" Theme) and CMake
project format.

At the same time, the preexisting QtQuick Application wizard in Qt
Creator now also focusses on Qt 6.2 and CMake. TS file generation is
removed for now, can be added later, but then using the i18n setup
feature of QQmlApplicationEngine (instead of a QTranslator in main.cpp).

The wizard now focusses on the QML CMake API. In order to filter the
kits accordingly, the flag "QtSupport.Wizards.FeatureQtQmlCMakeApi" was
added.

Task-number: QTCREATORBUG-28436
Change-Id: I80bc5585f31ec82c64f845701c768f8a07e000da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 13:09:59 +00:00
Cristian Adam
be1c5cab96 Fix static build of Qt Creator
When is QTC_STATIC_BUILD set to ON add_qtc_library will add a
<target_name>_STATIC_LIBRARY define, otherwise <target_name>_LIBRARY is
added.

Since Sqlite uses two libraries now both SQLITE_STATIC_LIBRARY and
SQLITEC_STATIC_LIBRARY need to be checked.

Change-Id: I07c4de01627754534da7e37d1261db37779df296
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-05 13:07:27 +00:00
Miikka Heikkinen
ff59de94e9 QmlDesigner: Create dragged item to correct position in 3d view
Fixes: QDS-8655
Change-Id: I8ab397e4dc571e50c4495f6690418b177afa4dbe
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-05 12:38:45 +00:00
hjk
4b237c0e98 ProjectExplorer: Return FilePaths for SessionManager::projectsForSessionName()
Change-Id: Ie168973e872ea105c7eb46ff7f58fb34883364b1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-05 11:07:14 +00:00
Thomas Hartmann
c1a16d51a6 QmlDesigner: Remove isQtQuick3DParticles3DModel
The type does not exist.

Change-Id: I03df9f67d49af1ff37a254f3ef17693f5d975ea9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-05 10:27:26 +00:00
Thomas Hartmann
28b6c30bd8 QmlDesigner: Fix lingering merge conflict
Materials are applied to Quick3DModel not QtQuick3DParticles3DModel
(Which does not exist).

Change-Id: I350d9864c7eb3a7b6879e8d58646c7c2c7b8e0d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-05 10:27:12 +00:00
Amr Essam
63e885e7a1 QmlDesigner: Create arbitrary type for effects to identify them in qds
Using arbitrary type name because at this time we don't have effect maker specific type

Task-number: QDS-8729
Change-Id: I3f70e241a03e0ce14512af1cafa066ef0a6c90d5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-05 10:25:36 +00:00
hjk
ac9023e851 Utils: Make Utils::withTildeHomePath a FilePath member
Gets .osType() right in remote cases.

Change-Id: I6397996062d976d7db690c5729dd4faa1f459563
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-05 10:17:10 +00:00
Eike Ziller
55fa109b59 CMake build: Use version-less Qt targets
Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-05 10:13:16 +00:00
hjk
894685d501 Debugger: Make calling std::function details skippable
Change-Id: I03415209557589a15d66e2ee4fd531f0f02bf5bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-05 10:10:21 +00:00
Cristian Adam
5e9f8b30d4 Utils: Add defaultValue getter for Aspects
Does the variant conversion based on the aspect type.

Change-Id: I2127a5a4202c3a60b946492b90a78beabaa11aed
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 10:02:02 +00:00
Artem Sokolovskii
ce1a547b6c CodeStyle: Fix preview update
Fixes: QTCREATORBUG-28621
Change-Id: I66a66d9c16933ebd8197f9e286e72dce7a621933
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-05 09:12:15 +00:00
Eike Ziller
098c717678 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: Ic8ada9fd47f5eb62e751b6188a45b95ddb36122d
2023-01-05 09:47:06 +01:00
Jarek Kobus
ea35ed9ffe AbstractProcessStep: Merge finish() with processFinished()
Change-Id: Ied15ec3ee9d3bcc80b03b2589d101c65f2fd062a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-05 08:43:21 +00:00
Christian Stenger
6832200313 Debugger: Add missing stretch
Amends 2b97f69796.

Change-Id: I44ddf368990c7ebbeeb5c07569ac5811a56f3c10
Reviewed-by: hjk <hjk@qt.io>
2023-01-05 08:42:10 +00:00
hjk
b9bba49275 Docker: Fix typo in test files
Change-Id: I4e7c0c0612d9dca8c815c5a378436574c4456a00
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-05 08:05:16 +00:00
Jarek Kobus
850d5e6a06 GerritModel: Reuse ProcessProgress
Change-Id: I229ab2cbb8137b6e1debe86eaa462110fdcc337e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-04 18:16:36 +00:00
Jarek Kobus
330a748f17 GerritPlugin: Reuse ProcessProgress
Get rid of unneeded State enum, future watcher and future
interface.

Change-Id: Id217d557c9051479cd3da872c1661c163cdf3a21
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-04 16:40:24 +00:00
Artem Sokolovskii
9320fb611a tracing: Remove foreach
Change-Id: I74f17198a9f98f958924214ad2058e295b313373
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-04 15:23:00 +00:00
Amr Essam
1482bc0ae1 QmlDesigner: Allow drag effects to only QtQuickItem elements
- While drag an effect from asset library,
it only applies to elements that are type of QtQuickItem and has layer.effect property.
- Highlight those elements when start dragging an effect,
so user know correct elements to drag to.

Task-number: QDS-8579
Change-Id: Iedeed0e5ac65ce8b635f5cca6311b05c85197695
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-04 14:21:56 +00:00
Thomas Hartmann
c81f5ba7d1 QmlDesigner: Fix resizeToItem with live preview
The live preview recreates the "containedObject" and reparents it
to the window. But the containedObject was not tracking this.

Now we track the children accordingly.
Using bindings to keep the size in sync.

Change-Id: I051e9621f150befffec548ae0bbd431bd18480ce
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-04 14:08:36 +00:00
Eike Ziller
ea1cafa675 GitHub: Build against 10.0.0-beta1
Change-Id: Ia473e53c32518dd5da1ef7bd7785fb34c52109e4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-04 13:39:51 +00:00
hjk
ad7fe6fa1c Utils: Drop commonPath(QStringList)
There's FileUtils::commonPath(FilePaths) nowadays.

Change-Id: I26e30d61eb80cb457458791e9ad049356f18de98
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-04 12:38:17 +00:00
Thomas Hartmann
56b9f99d76 QmlDesigner: The type name of Component is now QML.Component
See also: 90b8e482c9

Task-number: QDS-8725
Change-Id: I20cbf8a10015306fee708191095215b19a85614c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-04 11:27:07 +00:00
Alessandro Portale
9441865714 Android: FilePath-ify AVD handling code
Change-Id: Id08414f8fb9ce7f4fac5221cd24392e25f02f00d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-04 10:46:14 +00:00
Eike Ziller
34c206c700 Debugger: Also ship asm highlighting file
For highlighting disassembly views.

Amends b41abc94bb

Change-Id: Ifb5ddd50661459eb9deda9c2a419943777b1068c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-04 10:22:16 +00:00
hjk
b81d3d5cd2 ProjectExplorer: Use FileUtils::commonPath instead of strings
Change-Id: I917912fe441d1b72466c02ff9f3e743daa4eff92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-04 09:40:26 +00:00
hjk
ba42169e8a Core: Convert promptoverwritedialog to FilePath
Change-Id: I4c1fc7b8c8956f671a3beef8834fe8039333482e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-04 09:40:10 +00:00
Orgad Shaneh
a3d1ef4e89 PatchTool: Preserve CRLF when reverting a chunk
Fixes: QTCREATORBUG-12690
Change-Id: Ib408a33bd1bd69ebc27a029025313eaf7bdf4f18
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2023-01-04 09:19:21 +00:00
Henning Gruendl
afe7d48b6c UpdateInfo: Fix size policy on "show details" list
Task-number: QTCREATORBUG-28642
Change-Id: Id3b69aaf1532e54101824e8baa65a929c1a47a72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-04 08:55:26 +00:00
Eike Ziller
0a74a1e99e Properly support relative paths in Link with Qt UI
Relative paths are resolved based on the applicationDirPath, so reflect
that in the path chooser too.
Also, do not resolve relative paths in the path chooser to absolute
paths when writing to the settings.

Change-Id: Iaeffa2cad1e145adbbc5c918b5f8ff14f6f2b31e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-04 08:44:08 +00:00