Commit Graph

62421 Commits

Author SHA1 Message Date
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
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
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
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
Sivert Krøvel
b1a3e136b6 McuSupport: Add handling of os-specific validation paths
Before the refactoring, the various third party packages had detection
paths set to facilitate picking the correct subdirectory in QtCreator.
Adding these paths to the JSONs prompts hints in the Devices>MCU UI to
which path to enter, and prevents the user from picking the wrong path

Since the paths might vary based on the host-os, it is necessary to
enable parsing this from JSONs, similar to how the "defaultValue" is
handled. The "detectionPath" entry can either be an object with
separate values in fields named "windows" and "linux", or a string.

Change-Id: I813affe856fe73f6cf34ea75850500b49a1b2b6a
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Kwangsub Kim <kwangsub.kim@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2022-10-24 07:09:39 +00:00
Orgad Shaneh
bf0d2426b8 DiffEditor: Persist description widget height
Fixes: QTCREATORBUG-24286
Change-Id: Ie1bf1136bce973b7197b7378b48a85ec776e8f6d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-24 07:00:50 +00:00
Jarek Kobus
edd16c7047 UnifiedDiffEditor: Fix visible wrap column
Take m_visibleIndentOffset into account when drawing
right margin.

Fixes: QTCREATORBUG-26601
Change-Id: I50839098953181c667a5fe0e5fac7dfa5bc95327
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-24 07:00:40 +00:00
Rainer Keller
925a8a7a19 McuSupport: Give a reason for the toolchain being declared unsupported
Change-Id: I95eb399cbaa199b442ce0d9596477a039dce4f30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 06:28:03 +00:00
Rainer Keller
6326ccfe30 McuSupport: Store the source location of the JSON file
This allows to mention the file name the configuration was created from in
error messages.

Change-Id: Id8e3d4a754cf5c1f0a12c6b21af1158713c68690
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 06:27:57 +00:00
Cristian Adam
d42214e556 Core: Allow "Remove Folder" in File System View pane
As a CMake user from time to time I have the need to simply remove a
build directory.

This is now possible from the File System pane. Previously one had to
open a Terminal an do there a "rm -rf" or "rmdir /q /s" operation.

The user will be asked before, and there is no possibility of a misclick
and remove something the user didn't consent to.

Fixes: QTCREATORBUG-27331
Change-Id: I61aa42ce6587e46d635d9743b154f2bc9d163b1e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-22 16:30:30 +00:00
Adam Sowa
fb40998549 Android: Fix connecting to debug server using adb over WiFi
Remove port number from ADB's device serial number when setting remote channel for debugging.

Fixes: QTCREATORBUG-28342
Change-Id: I8b979af38aea5167693cb319a0a18490963b115a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-21 18:56:56 +00:00
Eike Ziller
698583dc01 Translations: Get some translations for Text Editor settings back
Display, font and tab settings.
No idea when that broke, but it is trivial to get back.

Change-Id: I96b809cb40c899bb62ddeaab03343181826930a8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-21 13:59:24 +00:00
Cristian Adam
bf83f63a13 CMakePM: Add installDir CMakePresets support
Is part of CMakePrests v3, and slipped at the implementation time.

Task-number: QTCREATORBUG-24555
Change-Id: Id3ce90c0a979d44287fc03ae1dd49a64e964cdf2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-21 13:09:35 +00:00
Cristian Adam
430ff621aa CMakePM: Use parent environment for $env{macro} expansion
Now the code takes into consideration the parent environment for
$env{macro} alongside the "environment" presets values.

Task-number: QTCREATORBUG-24555
Change-Id: I644618b0a6f866fd65a4109ee63b1f5bfcd4164d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-21 13:09:20 +00:00
Eike Ziller
7e60e6197a TextEditor: Fix wrong space in behavior settings
German translation done separately

Change-Id: I746ab8455109d83ca69c0add0a8d9e34555bea18
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-21 12:44:04 +00:00
Rainer Keller
6493f2793f McuSupport: Prevent multiple packages writing to the same key
Writing with an empty settings key will result in multiple packages writing
their value in the same key "Package_", with the suffix missing,
overwriting each other.

Change-Id: Iee3e042a2d9d5d1f4e34b903360129ba25b6f6ea
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-21 12:04:09 +00:00
Aleksei German
c897eacf49 QmlDesigner: Improve connection editor stability
Task-number: QDS-8039
Change-Id: Ie200eb080b82558925582a7720e40fc39e93ec63
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-21 11:50:43 +00:00
Alessandro Portale
acfd71831c Android: Fix crash in AndroidDeployQtStep
info.cpuAbi in AndroidDeployQtStep::init can be empty, for example when
opening a configured project with a different Qt Creator version, and
the "No valid settings file could be found." message appears.

Check for !empty(), before accessing the first item.

Fixes: QTCREATORBUG-27795
Change-Id: Ife0bf495ed8ea7bfb342300ee2e457398c8ee8f2
Reviewed-by: hjk <hjk@qt.io>
2022-10-21 11:12:41 +00:00
Miikka Heikkinen
f496970002 QmlDesigner: Don't copy/remove data property when copying all
'data' property contains node's children, so it should be ignored
during the 'copy all properties' operation.

Change-Id: Ib056409c9ad0a42ebc40f751173b7a3455d912c6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-21 10:58:50 +00:00
David Schulz
42481ced35 Editor: fix extra area width update
Do not missinterpret the new block count after a document change as the
requested extra area width.

Fixes: QTCREATORBUG-27267
Change-Id: Id724f68d223741bc36e4566e51e5d1d051f6cca3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-21 10:55:14 +00:00
Mahmoud Badri
bad166cda8 QmlDesigner: Maintain bundle categories expand state
Prevent categories auto-expanding when adding an bundle material
instance. Also some relevant tweaks.

Fixes: QDS-8043
Change-Id: Id87886c6d6e065f2c9c1253279348e076bc4d97f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 10:00:01 +00:00
Mahmoud Badri
2ccc4a03ed Revert "QmlDesigner: Add "imported" icon to the icons font"
This reverts commit b0fa747565.

Reason for revert: imported icon not needed anymore. also removed icons are needed.

Change-Id: I2d3423a585358abd760f55bba1215d6d2878fdc1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-21 09:40:44 +00:00
The Qt Project
0ad3b09b95 Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-10-21 09:02:14 +00:00
Christian Kandeler
79dd4a59ec ClangTools: Fix fail count displayed in info widget
Fixes: QTCREATORBUG-27330
Change-Id: I853d604c74d37179d56a16b71e1369cdc695c800
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-21 08:10:26 +00:00
Eike Ziller
8beb1fe775 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: Icd606068e77d6845cbbda5d48eda477cb21a312f
2022-10-21 10:03:56 +02:00
Jarek Kobus
243f66f97d UnifiedDiffEditor: Fix indent visualization
Add TextEditor::setVisualIndentOffset() protected helper.

Change-Id: I0755a732d07dec651c090dd6afd87d293453f0e1
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-21 07:38:04 +00:00
Jarek Kobus
3c9303c3b9 SideBySideDiffEditor: Synchronize left and right foldings
Change-Id: I2ff13db98981edf17190870c4d3ecea0113c8f3e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-21 07:37:54 +00:00
Alessandro Portale
3cda873d7b ClangCodeModel: Set actual fileKind in clangOptionsForFile
Change-Id: Iff9ad3a6135d73359d6d5cc841f23b2ec5fe332c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-21 07:22:02 +00:00
Jarek Kobus
e03e34c19c QmlEngine: Fix typo (hander -> handler)
Amends 126030d079

Change-Id: I3cec0e2984af311070ebb258b454d4e3fcec626f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2022-10-20 20:55:26 +00:00
Kwangsub Kim
d7f9f45daf McuSupport: Identify MinGW toolchain
QtMCUs will support MinGW toolchain for Windows desktop platform,
so MinGW toolchain needs to be identified.

If the default toolchain or a user configured one is a correct
MinGW toolchain, it would be selected. If not, a proper toolchain
would be picked up from the registered toolchains in Qt Creator.

Task-number: UL-6607
Change-Id: I82580d721d9ed916a6b32d35c124a638d7a3e68e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-20 17:55:00 +00:00
Mahmoud Badri
70f532c43f QmlDesigner: Allow drag-n-drop a bundle material to materials section
Fixes: QDS-8041
Change-Id: I848f636f41c58e11c719517f4073243a76e293b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 16:35:27 +00:00
The Qt Project
00b4da6f97 Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-10-20 14:27:21 +00:00
The Qt Project
e04edf5b1e Merge "Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0" into 9.0 2022-10-20 14:05:56 +00:00
Robert Löhning
e238c8f0a4 ClangFormat: Fix compilation with LLVM 15
Change-Id: I7990e8331c317d3bc363be610b2585d37dee4445
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
(cherry picked from commit a1bfcbf30d)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-20 14:04:22 +00:00
Jarek Kobus
e23e5faa82 Environment: Make systemEnvironment() thread safe
Fixes: QTCREATORBUG-26805
Change-Id: I839995699ffd25579a6a77405331a9802edaf7f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-20 14:00:13 +00:00
Cristian Adam
ea53baf897 Utils: Compilation fix on Windows Arm64
Amends 389d2acd87

Change-Id: I06cf1a3d93096f93c8133acccf6709d63f82eb63
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-20 13:35:07 +00:00
Eike Ziller
57a3afbb70 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp

Change-Id: I435b955899fcc70faaec6332de55283cf16b694f
2022-10-20 15:28:23 +02:00
Artem Sokolovskii
fecb6d50e5 Android: Fix emulator tool path
In cases where the obsolete "Android SDK Tools" package is installed
in addition to the "Android SDK Command-line Tools", the older
emulator launcher is called. One reason for that is that the obsolete
package has a higher version number than the new one.

This change resorts to checking the existence of the new emulator
executable and falls back to the old one.

Fixes: QTCREATORBUG-28196
Change-Id: I753e0901334a87314a2c8c70fbc69e55dffc500c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-20 13:07:24 +00:00
Eike Ziller
7b449c9463 Merge commit '029f926bcfcbb01' (origin/8.0) into 9.0
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: Iff498a1024f4a152ebdd3516ba13fa16cb6932d9
2022-10-20 15:01:00 +02:00