Commit Graph

76958 Commits

Author SHA1 Message Date
Cristian Adam
83e77d71a8 CMakePM: Expand cache variables for the preset probe
This way the CMAKE_PREFIX_PATH set to $env{HOME}/Qt (Linux) or
$env{SystemDrive}/Qt (Windows) would work as expected.

Change-Id: I03a9102d6d1da2a8740cab738577c47c44166c6c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-25 20:56:06 +00:00
Cristian Adam
ec4d96a14b CMakePM: Accept broken kits for CMakePresets
For CMakePresets if a preset is broken we should not create a preset kit
for every build type.

Instead reuse the broken kit created by the first build type.

Task-number: QTCREATORBUG-28295
Change-Id: I038fbb23817834f59ac73ccd2f9953f1a412b656
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-25 20:55:08 +00:00
Cristian Adam
7dfc7c627b CMakePM: Allow presets without generator specified
This allows presets that do not have a generator specified to proper
work.

On Windows CMake will detect "Visual Studio" as generator. This change
sets the generator and the architecture values accordingly.

Change-Id: I943e082430445c4b16cf9eaf4ae5ae2500b2bd2b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-25 20:54:59 +00:00
Cristian Adam
869597884d CMakePM: Merge cacheVariables, environment for inherited presets
cacheVariables, environment (and others) collection fields need to be
merged when having inherited presets.

Fixes: QTCREATORBUG-28360
Change-Id: I3d2b84355fad9ffa2dc4629ece7d42f7b482a859
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-10-25 20:54:49 +00:00
Orgad Shaneh
d63bfa4a29 VCS: Simplify submit editor accept/close flow
* Replace message box with an error on the output pane.
* Separate logic for accept and close.

Change-Id: Ib9fa201a1a67ee195086f7a22bc6678a9642452a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-10-25 19:19:40 +00:00
Tim Jenssen
aa33927651 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertychangesmodel.cpp
	src/plugins/qmldesigner/components/stateseditornew/propertymodel.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.h

Change-Id: Ib029a830ee99190bc4ea2ad75d9300bfa86b42d9
2022-10-25 19:02:15 +02:00
Miikka Heikkinen
8da35bac0f QmlDesigner: Add support for SpecularGlossyMaterial
Task-number: QDS-8087
Change-Id: Ic5cdca5d61d5f4ad11f63f3f5a59907798cde763
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-25 15:06:35 +00:00
David Schulz
0944bfb7f0 Editor: Fix find usage position in context menu
Do not add the find usage action to an editor context menu if it is
already there.

Change-Id: I0a98d81ae0e08be69ca2579af5701b5fbc8ccbda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-25 15:05:38 +00:00
Thomas Hartmann
162635cbe8 QmlDesigner: Allow QtQuick 6.4
Change-Id: Icb7f3be479f3e2db6b500fec7c209cb429ff4f22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-25 14:45:50 +00:00
Thomas Hartmann
f8a272e076 QmlDesigner: Bump QDS version in .qmlproject
Change-Id: I39cefcd5c1a16fd56eb05c485eeb11471683aeec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-10-25 14:45:43 +00:00
Christian Kandeler
13f40f5471 Utils: Add sorted() function
For simpler calling code.

Change-Id: Ia0a16a28770fd172f74d06a626148248bf5d3c0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-25 14:29:45 +00:00
Philip Van Hoof
55b8ab7846 cppeditor: make it possible to ignore patterns
Allows the user to ignore certain patterns so that these files wont
be indexed

Fixes: QTCREATORBUG-28313
Change-Id: I2a860a473ca1a267e9fab31436fc98b8f4004484
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-25 13:46:02 +00:00
Marcus Tillmanns
d46a079744 Utils: Fix copyFile to include permissions
Also adds line breaks to info output.

Change-Id: I314ab87a47d7bd7541acb6a1553238fcfc27099d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-25 13:31:10 +00:00
Marcus Tillmanns
b9062e9c80 Debugger: Fix crash on start debugging
Change-Id: Iff517a977f85bd4ac6e1fdac502797f2455ae6f6
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-25 12:18:15 +00:00
Mats Honkamaa
552831ead4 Doc: Update documentation on how to share apps online
Provide basic information and instructions about sharing applications online

Task-number: QDS-7155
Change-Id: I69632f370a452c1b9cc03ebac260f0382a89449b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-25 11:23:20 +00:00
Thomas Hartmann
09b17bcb4c QmlDesigner: Remove [[noreturn]]
The throw is conditional now.

Change-Id: I058fa8c665714cd9375ee4414a1280e85b6ca270
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-25 10:33:37 +00:00
Miikka Heikkinen
001d55e1f0 QmlDesigner: Fix empty texture source after drag to map property
FilePath::toUrl() returns an empty url if filepath doesn't have
scheme/host set. This seems to be Qt 6.4 issue.

Worked around the issue by just assigning the relative path directly
without converting to url first, as I don't think there's ever going
to be a case where the filepath will have proper scheme/host here.

Fixes: QDS-8044
Change-Id: I37ae3875bf4386cffc122fd3b030f2b0bf068269
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-25 10:09:18 +00:00
Jarek Kobus
866a658b42 Get rid of unneeded includes of RunControl
Removed also some other includes that were marked
with yellow triangles. In some cases includes of
runcontrol.h were substituted with other includes,
like qtcassert.h.

Change-Id: Ica40f68198c7f8f70e6047acb2eddc8ef017e43d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-25 09:49:13 +00:00
Thomas Hartmann
da11533a6d QmlDesigner: Add space to ItemLibraryEntry name for ColorAnimation
Task-number: QDS-8079
Change-Id: I09057c58ca17cae22bbea7d5b67eba0ca48e9cf2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-25 09:39:04 +00:00
Miikka Heikkinen
a0a8bf2245 QmlDesigner: Fix puppet creation in 3D asset importing
Fixes: QDS-8038
Change-Id: Id7d2b681253fca5afd2611aacccd6aef2ec23b40
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-10-25 09:19:52 +00:00
Ali Kianian
f2f6f6e6cc Reload material property groups when model changes
The property groups would be unloaded when a model is detached,
and it would be loaded when the model is attached.
The problem was that the unload function was missing for the
MaterialBrowserModel.

Task-number: QDS-7515
Change-Id: I89064a78552c10228c0b18e42c1e0df4a92fb4a6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-25 09:18:51 +00:00
Thomas Hartmann
0e7bb80408 QmlDesigner: Use QML_COMPAT_RESOLVE_URLS_ON_ASSIGNMENT
At least for now this is the better default for QDS.
See also for example the SafeRenderer items.

Task-number: QDS-4812
Change-Id: I03d614ec52c1e5ab11576bbfdaa3bad0d72f0fbf
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2022-10-25 09:11:07 +00:00
Christian Stenger
6cc47de5b1 PE: Do not use setVisible() before having a parent
Fixes shortly popping up floating widget on the Build & Run
settings page.

Change-Id: I8bcc887ae73b9cb27f690548d0e98038fb757674
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-25 06:43:24 +00:00
Robert Löhning
c72a93599d Squish-Tests: Use QTC_DO_NOT_PROPAGATE_LD_PRELOAD
This is a reaction to an change in Creator's handling
of environment variables. Creator now passes on
LD_PRELOAD set by Squish. This results in build errors
and crashes of started applications.

Change-Id: I39cf21c60a474d7453e9c29fd3eaf32d3f0d6806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 19:20:07 +00:00
Miikka Heikkinen
b662c50e0a QmlDesigner: Fix node creation via 3D view context menu
Relevant code was commented out in a previous 8.0->master merge as
there were some conflicts caused by API changes in some components.
Updated the code to use new APIs.

Fixes: QDS-8045
Change-Id: I20f1dd700a2c1864151372624f4ceb1415b76f04
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-24 12:24:41 +00:00
Leena Miettinen
85cf6f3365 Doc: Describe Configuration field in CMake build settings
Update screenshots.

Task-number: QTCREATORBUG-27876
Change-Id: Ib0424bef44ac29078a86445da5032011ffc7ff94
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-24 12:19:52 +00:00
Christian Kandeler
a459ee5d24 ClangCodeModel: Re-enable renaming via clangd
The hard rename limit is gone, see https://reviews.llvm.org/D136454.
Make the feature opt-in for now, as we still need to do some UI fine-
tuning

Change-Id: Ic631a5b39711c6f37fffeeec4d2a5f5bf3bde92b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 11:44:51 +00:00
Christian Kandeler
8662470aba CPlusPlus: Allow " = default" also on function implementations
Note that we only make sure not to trip over valid code; we make no
effort to check whether default/delete is actually allowed at this
type of declaration.

Fixes: QTCREATORBUG-28102
Change-Id: Ic693319b9dfaf8652cf4cae9cd907a6e258ad773
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 11:43:21 +00:00
Daniele Bortolotti
16261ad472 McuSupport: Improve version detector logic
McuPackageDirectoryVersionDetector class name was misleading,
McuPackageDirectoryEntriesVersionDetector better describes its
purpose as it can be used to search for a regex match among the
entries in packagePath filtered by filePattern. Also, remove
isFile boolean member variable since is not needed for current
use cases, ie Renesas Graphics library (RGL), and filePattern
can be used instead.

Also, improve version detector creation logic. If no filePattern
is present in the Json kit file, the regex match is based on
packagePath only, which is the correct way to detect the version
for RGL.

Task-number: UL-6642
Change-Id: I3ee2fdb623bdd77aea60f9eae3672b9b5aa40433
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 11:40:11 +00:00
Miikka Heikkinen
ccb0349453 QmlDesigner: Don't create module import if later version exists
When creating nodes via 3D view context menu, later versions of
imported modules are also accepted rather than just the exact required
version specified in the ItemLibraryEntry. This fixes the issue of
adding duplicate import statements for the same module with different
versions.

Change-Id: Id8437a1817346839488bea7bf89529cc63f4849f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-24 11:38:42 +00:00
Rainer Keller
9566124cad McuSupport: Evaluate macros in paths when applying settings
A macro entered by a user was not evaluated. Only the initial strings where
expanded when the targets are created on first start.

Task-number: UL-6697
Change-Id: I642bb4bc41e116cd0fe7f002da3d7f3cb301e62d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2022-10-24 11:01:05 +00:00
Rainer Keller
1db2a10b73 McuSupport: Use signals to propagate path changes from McuPackages
Instead of calling the update function manually unconditionally it will be
called through a connection.

Change-Id: Ibfd3efd0fbaa66c4857d8a15c202472e1f00f576
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2022-10-24 11:00:58 +00:00
Rainer Keller
34d0f2e678 McuSupport: Fix invalid version detector being instantiatied
In case the JSON entry was missing completely, a directory version detector
was instantiated.
Instantiate version dectectors only if there is enough and valid
information available.

Change-Id: Iaf9cd40165e4d75124f3e0ddda66db2f4dab5ff7
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:59:49 +00:00
Rainer Keller
6fae98477b McuSupport: Fix invalid regular expression is considered valid
If a match was empty it was the same case as if no regular expression was
set. Adding a new case that is triggered when there is a version detector
but it returns an empty version string.

Change-Id: I26c2f803b2c6a95b85d6b781085bfa9cd4b51975
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 10:59:43 +00:00
Rainer Keller
2c6235998d McuSupport: Use PROGRAMFILES environment variable
The path was generated using the environment variable PROGRAMSANDFILES,
while only PROGRAMFILES is defined.

Task-number: UL-6618
Change-Id: I5ebff81d39a437586af905f56099c17c1afc1bd0
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:52:44 +00:00
Rainer Keller
a62155d98a McuSupport: Fix crash
The function updateStatusUi is modifying children of the main widget.
In case the package changes when the MCU dialog is not present anymore it
tries to access invalid widget pointers.

Change-Id: I9127114caf03b4ea047b075e875f20bb3e0c02b4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:49:40 +00:00
Rainer Keller
50a5ceeaaf McuSupport: Provide static function for external use
Make the static function public to be used by other classes as well.

Change-Id: Ifc9e423cba04557d83696446c11df7cd16a421ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:49:33 +00:00
Christian Stenger
920389a660 McuSupport: Fix qbs build
Change-Id: I7efa2aedd022c510ab03718e69eabb11b9e15b16
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-24 10:49:30 +00:00
Rainer Keller
6c7616de1b McuSupport: Avoid accessing invalid pointer
After the options dialog has been closed, all widgets are deleted but
the m_fileChooser will not be set to nullptr again.
Avoiding to use the widgets for data based accesses.

Change-Id: I5d99fc4a34ecd9d22e26854c6956e9c0116de94b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:49:28 +00:00
Knud Dollereder
5316a8f799 QmlDesigner: Make Formeditor remember the zoomlevel
Fixes: QDS-7832
Change-Id: Ife627a72a03be8a946aabfc8af6730a81eb5d611
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>
2022-10-24 10:23:37 +00:00
Christian Kandeler
72c1c891fa ClangCodeModel: Adapt to new highlighting modifier in clangd
See https://reviews.llvm.org/D134728.

Change-Id: I2bcfb09736b6eabc54cd986b0c096c8fa5869b8e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 10:08:49 +00:00
Christian Kandeler
8608386c36 CppEditor: Adapt include locations when renaming ui files
Fixes: QTCREATORBUG-14259
Change-Id: I5e8209338b531f0e65d85b423053bd19a8b47652
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:07:26 +00:00
Robert Löhning
2acc90a0ba SquishTests: Update tst_create_proj_wizard
Change-Id: I652f2504d1e13ae8c93429a99d31d3754bd57298
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:04:00 +00:00
Robert Löhning
86f87605f9 SessionDialog: SquishTests: Update tst_session_handling
Change-Id: I6fcdb6173c39715e85f4cf37d12e7707b2e5d066
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 10:03:22 +00:00
Leena Miettinen
4fee43c76f Doc: Use "which" in clauses that add supporting information
Fixes: QTCREATORBUG-28364
Change-Id: I98bbff1886fc63d024dd9ce57720274b598bf6de
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 09:26:01 +00:00
David Schulz
af7b0802a8 Python: fix PySide project tool detection
The tool moved to the PySide6-Essentials module.

Change-Id: I204d2025bc51b6c5cffe82cba66878d077f03b72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 09:17:46 +00:00
Cristian Adam
534c312d27 PE: Use original vcvarsall.bat to do environment cleanup
Amends ae07c31976

Calling a VS2022 vcvarsall.bat /clean_env in a VS2019 environment causes
failures. Using the original vcvarsall.bat does the proper cleanup.

Change-Id: I12426e9eb97baecae5357e6bb419333464ea1ded
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 08:51:55 +00:00
Leena Miettinen
51c1accfa5 Qt Quick Designer: Fix references to changed view names in UI text
- Form Editor > 2D
- 3D Editor > 3D
- Text Editor > Code

Task-number: QTCREATORBUG-28334
Change-Id: I65f693b47b1c361dae3c270333ff036e4c473b9e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-24 08:17:17 +00:00
Marcus Tillmanns
604f542b20 ProjectExplorer: Allow selection of remote build directories
Change-Id: Ieaf0b01bde6d043782d6d9d4bb745c090c6087c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 07:22:05 +00:00
Robert Löhning
f42282b492 SquishTests: Update "Save before build"- checkbox
Fixes tst_save_before_build

Change-Id: I7af2c215dcb55796498875d1ed62783f37edb664
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 07:14:27 +00:00