Commit Graph

76860 Commits

Author SHA1 Message Date
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
Mahmoud Badri
0ac1920ed2 QmlDesigner: Clear search upon adding a bundle material
Fixes: QDS-8025
Change-Id: Iaa1f7d9f94b602e60171a00d0cc51d5b19d71468
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-20 08:09:53 +00:00
Marcus Tillmanns
36d7dcb6b2 CMake: Improve styling of cmake buildconfiguration
Shortens the "Run CMake" button and the cmake variables
tab header to make them easier to read on wide monitors

Change-Id: I2579a8fa1c2899ae94f9c4a72c4188dc61ecd5f9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-20 07:56:02 +00:00
Leena Miettinen
7c9d1ef516 UI text: Fix UI text to follow the guidelines
- Fix typos
- Replace "options" with "preferences"
- Fix capitalization
- Remove "please"
- Do not use contractions

Task-number: QTCREATORBUG-28334
Change-Id: Ie029eae435634aa2fb354e173fa107af72f7b025
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-20 07:38:32 +00:00
Miikka Heikkinen
c45f4eb654 QmlDesigner: Add support for easingCurve property to EasingCurveDialog
QtQuick3D.Particles3D.ScaleAffector has easingCurve property.
We want to use existing EasingCurveDialog to edit the value, but the
current dialog only supports property named 'easing' (used in
animations). Added support for 'easingCurve' property as well.

Task-number: QDS-8014
Change-Id: If0f47608f7ed3cb9db4a44f632d15b2135856800
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-20 07:35:30 +00:00
Leena Miettinen
b9e45d7b30 UI text: Fix spacing in multi-line messages
You need an empty space at the end of a line (before quotes),
but no empty space after \n.

Task-number: QTCREATORBUG-28334
Change-Id: I192836cb10b819a359778879c64e6b80aaa059f2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-20 07:02:52 +00:00
Marcus Tillmanns
3ac5051af9 Utils: Fix FilePath::fromString host decoding
Previously FilePath::fromString did not decode %25 (%) and %2f (/),
so a round of ::fromString(::toString()) would not return the same host.

Change-Id: I99c7317fb149443c2e52c099f7da7c4ef6768aff
Reviewed-by: hjk <hjk@qt.io>
2022-10-20 06:45:42 +00:00
Christian Kandeler
5c313b706f ProjectExplorer: Show missing warning text in MakeStep widget
The tooltip didn't show up at all, and even if it had, it would be weird
to have a warning icon all by itself.

Task-number: QTCREATORBUG-25089
Change-Id: I517c762b050f93aa2f2c4aa89f208e4ccb7515c5
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-19 14:00:20 +00:00
Artem Sokolovskii
60cd36ed31 ClangFormat: Remove deprecated entries in clangformatconfigwidget
Task-number: QTCREATORBUG-28263
Change-Id: I48b0456f3c7bea88905cea40d1e447655da64676
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-19 12:39:31 +00:00
David Schulz
938e9cab0f ClangCodeModel: fix null pointer access
Change-Id: I2c9e4dc04b7b27986eb0a3a74d8fa6879715df87
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 12:25:55 +00:00
Yasser Grimes
2d5512f2c4 McuSupport: Indicate the usage of QtCreator9+ for QtMCUs 2.3 and above
Starting from QtMCUs 2.3 legacy code is not used in McuSupport plugin
and the refactored code is used instead.
Trying to use 2.3 in older versions of QtCreator will result is using
incomplete refactored code causing errors when generating kits.

This commit will indicate to the user to choose the correct version of
QtCreator for newer QtMCUs releases.

Task-number: QTCREATORBUG-28286
Change-Id: Ib3934ef50f9cee81f1fac8a36674473fc2169ef5
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: hjk <hjk@qt.io>
v8.0.2
2022-10-19 12:24:13 +00:00
Leena Miettinen
14938b3881 Extension system: Make message shorter by removing repeated text
Task-number: QTCREATORBUG-28334
Change-Id: I44f95e96d16390b355628d9b8f6bc2b5a79025c2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-10-19 12:11:40 +00:00
David Schulz
3754ce184d LanguageClient: remove refactoring markers when deactivating document
Fixes: QTCREATORBUG-28182
Change-Id: Iab52862ecc205c65d8fbdac34b5f9bc78766e33b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-10-19 12:01:59 +00:00
hjk
b4446607ec App: Also accept --version with two dashs
That more common on Linux.

Change-Id: Id724932565a6d5292012e446914ef4fac1b4f652
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-19 10:54:16 +00:00
hjk
0819bf3781 App: Make -version output go to stdout
Fixes: QTCREATORBUG-28327
Change-Id: I0a263ec79ab49a4d1d0816fe798d8a0403e6fce0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-19 10:52:57 +00:00
David Schulz
0c7883f384 LSP: Fix translatable error message
Change-Id: I687c58d87e75ac665aaa1817cf5ddd06382008d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 10:30:54 +00:00
Eike Ziller
2f3a6fff93 System settings: Fix translations after context change
The context unnecessarily changed from Core::Internal::SystemSettings
to Core::Internal::SystemSettingsWidget. Change it back.
Some translation were partially updated inbetween, remove duplicates
by prefering the new translations.

Amends dae9cb13cf
and b0847af740

Change-Id: If604c5fa0f40d8f5ac273f01c189ffaf45b67811
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 10:12:56 +00:00
Christian Kandeler
0759f55c00 ClangCodeModel: Make use of clangd's new "definition" modifier
See https://reviews.llvm.org/D127403.

Change-Id: I791b2396266810bfb3610a9f37565e4f01d67879
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 10:09:16 +00:00
Cristian Adam
1c51dc1adf CMakePM: Do not use systemEnvironment() for CMakePresets
This doesn't mean that CMakePresets will work with a remote project, but
at least it avoids Environment::systemEnvironment() usage.

Change-Id: I17081c747d32e50224ac74507d3aa336ff5c8948
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-10-19 10:08:06 +00:00
Eike Ziller
fdee55643a New dialog: Fix translations after refactoring
The translation context unnecessarily changed. Change it back.

Amends 4e7ee4687b

Change-Id: Iee0f862bc492c6e90d58050d8a217eb9d485a2ee
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:59:34 +00:00
Mats Honkamaa
029f926bcf Doc: Fix 3D effect docs
Task-number: QDS-8026
Change-Id: Ic59b58e8d0c033b2fc6ec1e18d0ca4ddcfe63699
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-10-19 09:57:26 +00:00
Thomas Hartmann
5ca3db5ff7 QmlDesigner: Fix crash
We access the rewriterView() for the decription.

Change-Id: I30883d02ab1a2b12dcd6a2bcac6fae82b97a2f5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:51 +00:00
Thomas Hartmann
1523129d50 QmlDesigner: Add helper function to StylesheetMerger
Change-Id: If3857af4a3541cb1b77a87d168f33571954dd5e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:41 +00:00
Thomas Hartmann
ea13277c7a QmlDesigner: Fix StyleMerger for custom types
If the template uses custom types they are only found if
we register the correct fileUrl.

Change-Id: Ia358a39d5c5c5bbcaf403ae3c250495ddadfc326
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-19 09:45:32 +00:00
Cristian Adam
23092b57b8 CMakePM: Use filePath().deviceEnvironment() to find ninja
Amends 45ec26783f

Change-Id: I05b52295841d60ff693d6e7b12c9e4ceaf0f09eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 09:32:23 +00:00
Cristian Adam
ae07c31976 PE: Clean environment before compiler environment detection
By calling vcvarsall.bat with "/clean_env" before the actual
vcvarsall.bat call we make sure that the correct environment settings
are picked up by Qt Creator.

For example calling Visual Studio Community/vcvarsall from an
environment where Visual Studio BuildTools/vcvarscall was already
called, will not return a Visual Studio Community environment, but a
Visual Studio BuildTools environment.

The above scenario can happen when developing Qt Creator itself with a
different Visual Studio setup.

Fixes: QTCREATORBUG-28315
Change-Id: Ib99cbba2a5c6299953728e92cf0283c10f7837f3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-10-19 09:11:20 +00:00
Marcus Tillmanns
6dd15ef3f3 ProjectExplorer: Ensure working dir is reachable
Previously the working directory might not be reachable by
the executable.

This change fixes that by calling "ensureReachable", and
changing the path to an on-device path of the exectuable.

This also fixes the path when the Host is Windows, and
the build device is a unix type system by changing the paths
from e.g. "c:/..." to "/c/..."

Change-Id: I6c86e16c867bb654b6c2a4951d9f62fdb879298e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-19 08:56:35 +00:00