Commit Graph

76686 Commits

Author SHA1 Message Date
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
Mats Honkamaa
1ac0acbd7f Doc: Update states view documentation
There is a new states view, documentation need to be updated.

Task-number: QDS-7892
Change-Id: I17ac7c192d4a8ddf0a10da6c8e399b126dabfebe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-24 06:53:48 +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
Leena Miettinen
59b92b6417 Doc: Create separate topics for Qt Design Viewer in QC and QDS manuals
The process in the two apps now differs too much for single-sourcing
the docs to be helpful.

Change-Id: I3aa60c9f2219d19843f5a4c635fc49c83548f13f
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-21 13:24:00 +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
3055850fde Merge "Merge commit '2d5512f2c4e' (origin/8.0) into 9.0" into 9.0 2022-10-20 14:06:05 +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
Robert Löhning
e5aaf00453 SquishTests: Update NewDialog again
Change-Id: I7cb4296c8938ce5e04994863fdd69024f1e9d909
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 14:03:19 +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
47d0ec007e Merge commit '2d5512f2c4e' (origin/8.0) into 9.0
Merges the single commit 2d5512f2c4 by ignoring it.
It was just a hack for 8.0.

 Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ia3b94eee5f5b936931bb0ed536829ae13ec56244
2022-10-20 15:05:54 +02: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
David Schulz
89e16e8b8c Python: map building directory to pyside project device
Change-Id: If261483864a5e4a13554fdefbf3d9076b7d1f687
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-20 12:47:05 +00:00
David Schulz
f012f1b245 Python: try to find interpreter on device for run configuration
If the default interpreter is not on the run device of the kit try to
find any interpreter on that device and use it as the default
interpreter for this run configuration.

Change-Id: I52985281f0f1d2ac88759169400d64121299f95d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-20 12:46:44 +00:00
David Schulz
c81a5c0644 Python: trigger parse in build system creator
Otherwise we do not have any app targets for the python run
configuration after a kit setup.

Change-Id: Ib7648a72280a1d68246c11139775a23366fda286
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-20 12:46:37 +00:00
Leena Miettinen
4c936be3a9 Doc: Update Image Viewer snapshot and add icons to instructions
Arranged the feature list according to the order of icons on the
toolbar and added icons.

Edited some text.

Task-number: QTCREATORBUG-27876
Change-Id: I4357329fbc137ea39b87e3630de507981d1611e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 12:31:00 +00:00
Henning Gruendl
cf9b36a6c7 QmlDesigner: Use AUX property to remember state
Use AUX properties to save the StateThumbnail state (property changes or
thumbnail). Also the save the state of the property changes state
section (expanded or collapsed).

Task-number: QDS-7732
Change-Id: I607bb05b7c71bb98e7781d058bb5736ab4b77e72
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:10:25 +00:00
Henning Gruendl
ac0251e106 QmlDesigner: Block DragHandler when menu open
Task-number: QDS-7851
Change-Id: Ia48e326c1f33d7b405eb2f93936e3aa99f0a9e60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 12:09:14 +00:00
Cristian Adam
d643ad80cb ProjectExplorer: Allow "cc" for MinGW imported compiler
Amends 152c01bd86 which added "c++"
as a C++ compiler.

Change-Id: I8ad77a488b74dce6170ebf824b7f372083847a2c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-20 12:04:07 +00:00
Leena Miettinen
b4c3431768 Doc: Fix qdoc command \section to \section1
Change-Id: I500a5dc5e84e19e975904cc5d04a465f736dc86b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-20 11:43:09 +00:00
Leena Miettinen
c4ac5e414a UI text: Use a full stop in the end of messages
And fix the capitalization of some message box titles.

Task-number: QTCREATORBUG-28334
Change-Id: I858eefd5a12494723c40e0253a3708fa77284d1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 09:25:08 +00:00
Jarek Kobus
d0278ae295 SelectableTextEditorWidget: Handle display settings
Avoid code repetition inside UnifiedDiffEditorWidget
and SideDiffEditorWidget.

Connect to display settings changed signal and apply
all but 4 settings (which are not desired for diff editor).

Change-Id: If4ae7f7c55690dac04fd1a00f8822db666a9ce2b
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-20 09:19:07 +00:00