Commit Graph

80147 Commits

Author SHA1 Message Date
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
hjk
77e7f0e314 AutoTools: Simplify build step implementations
... and make it usable remotely.

Change-Id: Ib19b661ba5cbb7b8a585c0b130dd672605ff0506
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 14:14:49 +00:00
hjk
d995b650ab ProjectExplorer: Remove now unused RunWorkerFactory setup functions
Change-Id: Ibac853d2ecaf8e22a64e17d54a1e82121257c655
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 13:51:21 +00:00
Cristian Adam
83a86bc4fe CMakePM: Reuse EnvironmentAspect for CMake configure environment
EnvironmentAspect is used in the Run configuration page.

For a configuration not using presets the "Build Environment" will be
used by default. This is the pre Qt Creator 9 behavior.

With presets "System Environment" is used, which allows the environment
sepparation of configure and build steps.

Fixes: QTCREATORBUG-28513
Change-Id: Ie65c0a5ac67355642460fca9fc618a1d29f4b1bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-24 13:24:23 +00:00
Jarek Kobus
567216bb49 TaskTree: Fix continuation of group with parallel limit
Change-Id: I10c40d06c21a0446187b8227b526ee903c569307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 13:15:54 +00:00
Mahmoud Badri
3e2cd2618f QmlDesigner: Enable drag-n-drop a texture to Navigator
Fixes: QDS-8206
Change-Id: I1d36a92d9f569b85c6e63486b39f756221019f05
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-24 10:55:07 +00:00
Pranta Dastider
cc76b36c64 QmlDesigner: Update Tooltips for Character Section
This patch update tooltip text for Character Section fields
in Property editor.

Fixes: QDS-8806
Change-Id: I5f03394a79c8ce187309ddbb0f35d99d062f11a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 10:50:49 +00:00
Pranta Dastider
3f4f6fa611 QmlDesigner: Update Tooltips for TEXT and FONT EXTRAS Sections
This patch update tooltip text for Text Extras
and Font Extras Section fields in Property editor.

Fixes: QDS-8807
Change-Id: I3253f21f5466368098d4c330986caa0ec1e81696
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-24 10:50:43 +00:00
Alessandro Portale
540b679c14 QmlDebug: Tr::tr
Change-Id: I420f15db36a3da30a0a788c0af09e935f62902c7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-24 10:24:53 +00:00
Alessandro Portale
1129079108 LanguageServerProtocol: Tr::tr
Change-Id: Ica2f568385545552b255fcf05694e8ecde92407f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-24 10:24:46 +00:00
Alessandro Portale
ad1ae7bd48 ExtensionSystem: Tr::tr
Change-Id: I93266b536d441634ce5f8017c4b77b6d4ffe5b89
Reviewed-by: hjk <hjk@qt.io>
2023-01-24 10:24:39 +00:00
Robert Löhning
1c25a48393 Squish: Update getQtCreatorVersionFromFile()
Change-Id: I9ca74e66c71b363604c6ea1467b2d1ccdffb45f5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 10:24:14 +00:00
Christian Kandeler
86c2143353 QbsProjectManager: Make generated sources known to code model
The code model should know about e.g. ui headers belonging to the
project.

Change-Id: I89acb679f22fc050b3ac3b3e77fc64154ad05c20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-24 10:07:13 +00:00
Henning Gruendl
d250e356dc QmlDesigner: Add control style support
* Add support for changing the style of StudioControls via property
* Fix copyright headers
* Refactor property names
* Fix internal property references by adding id
* Remove import version

Change-Id: I25abbbe276fcf3a6eeac7cab7c59574bed91c33a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-24 09:37:28 +00:00
Jarek Kobus
8e3a22329d QtcProcess: Add closeWriteChannel()
Change-Id: I080be230ec420ead2866f9481123125361e57033
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-24 08:48:12 +00:00
hjk
34fd5b3ced Utils: Improve FilePath::toUrl for local cases
Change-Id: If1674f97eeeb91173dc2b482662228c1c3f0f332
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-24 08:33:43 +00:00
Alessandro Portale
64b5364cab Android: Factor out removal of ndk packages from list
Will be used in additional places, soon.

Change-Id: Iceff0d14175f0bc9132d697d82ac46049a84ec17
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-24 07:27:44 +00:00
Alessandro Portale
e2eab57a28 Android: Factor out parsing of platform version into a function
Will be used in additional places, soon.

Change-Id: I95f62f05f390dffc75fdd599e9a18124985cb185
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-24 07:27:36 +00:00
hjk
e7321e98b8 ProjectExplorer: devicemanager.cpp code cosmetics
Unused code, namespaces.

Change-Id: I6efcf3dc9b6aa9a030b92b7a116b1fcaf7b0823d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-23 17:08:46 +00:00
Alessandro Portale
9c4e48b4b1 CppEditor: Merge orphaned translation contexts with ::CppEditor
Change-Id: If922580fa3626331401322d9cb0276305e3e198f
Reviewed-by: hjk <hjk@qt.io>
2023-01-23 16:32:48 +00:00
Alessandro Portale
9bfb289cea Beautifier: Merge orphaned translation contexts into ::Beautifier
Change-Id: I375fbedb2d79e336f5dd58c7089fd0f712306c4a
Reviewed-by: hjk <hjk@qt.io>
2023-01-23 16:32:43 +00:00
Thomas Hartmann
8d02bbf075 QmlDesigner: Add display name more feedback popup
Task-number: QDS-8870
Change-Id: Id8d1c98dec71e962b63a144c234642417e1df602
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-23 15:12:20 +00:00
hjk
87c3f08e52 CMake: Move settings storage closer to class implementation
Simpler in use.

Change-Id: I8cc929001035974b9b73566b206410bfd77f73a6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-23 14:49:45 +00:00
Christian Kandeler
38faf098c8 QbsProjectManager: Refactor raw project part creation
No functional changes. Preparation for bugfix.

Change-Id: Ib391a597b2ba615250b1219451f7dc537476f8af
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-23 14:43:18 +00:00
hjk
3d32412271 ClangCodeModel: Remove unused files
Change-Id: Id9490ee1fcf16d16b6e675e9c5c09de47cb6dc09
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-23 14:34:54 +00:00
hjk
c3e44bb3bb QtSupport: Pass empty device root for local Qt
Fixes: QTCREATORBUG-28680
Change-Id: Id90b6b9427d4b85ebc4e9f097dfdd996062d4c85
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-23 14:29:31 +00:00
Miikka Heikkinen
fa6eea93f9 QmlDesigner: Fix texture editor preview inside subcomponent
Properly resolve relative path based on current document.

Fixes: QDS-8882
Change-Id: I2f71d3b55a29754e88aabd24049ffbe1fd51d93e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-23 14:11:06 +00:00
David Schulz
9938fffe06 LanguageClient: close and reopen renamed documents
That is the way accoarding to https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_didRename

Change-Id: Ibed1873ac85eb2e9074481537a34f959a55a6f71
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-23 14:01:20 +00:00
hjk
ea1d729669 Utils: Move PathChooser::expandedDirectory() to its only user
... and simplify its use given the always empty base dir there.

Change-Id: Ieeff7f31653db1512edc2cc448f80efc9bb7222e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-23 13:49:16 +00:00
hjk
156ef28d90 Utils: Start migration of FileSystemWatcher to FilePath
This duplication of the interface is a first step, the
QString based part will be gone in the end.

Change-Id: I5e6378a92f96324188b917599b50def536f57bbe
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-23 13:46:42 +00:00
Miikka Heikkinen
af7ce87c2d QmlDesigner: Fix TypeError warning in material browser
Change-Id: I8150244aa5556340eea4cec8e4a15825280df742
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-23 13:25:32 +00:00
Assam Boudjelthia
5bbc7ea0f5 Android: Add option to set the build-tools version in project settings
Allow QC to directly set the build-tools version for the project.
Such setting could be in qmake/cmake, however, ideally this value
should be the latest available version, and doesn't need to be written
to the project file. Thus, it is convenient to have this selectable
from QC UI for convience, while developing.

Apart from the first reason for avoiding writing this into the project
file, there is QC limitation which doesn't allow writing such value
to CMake project file.

Task-number: QTBUG-97002
Change-Id: I5d54d36f7900f8445359188d6ae7a8ba14bd3a05
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-23 13:01:41 +00:00
Jarek Kobus
b1ef25b208 TestResult: Devirtualize the class - part 3 of 5
Step 3 - implement directParentHook.

Change-Id: I87518e700e9019ccd5b8a095b23971ae26eb776e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-23 12:43:17 +00:00