Commit Graph

77129 Commits

Author SHA1 Message Date
Christian Stenger
f792dc0216 AutoTest: Fix Catch2 output handling
Handle warnings or explicit failures instead of ignoring
them.

Fixes: QTCREATORBUG-28394
Change-Id: I5ccde8e7b9dfa1118f42ea881b9152069616193f
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-07 13:13:47 +00:00
Jarek Kobus
dc9cb0562a Utils::Id: Make access to internal cache thread safe
Secure all accesses to internal cache with QReadWriteLock.
Move firstUnusedId into secured scope, too.

Fixes: QTCREATORBUG-28415
Change-Id: I99d23213ec169b2b74748f54c98b834f88ab6a3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-07 11:58:57 +00:00
Miikka Heikkinen
9febccb2d7 QmlDesigner: Update material browser materials on state change
More generally, materials previews are now updated whenever the
instance values on them change.

Fixes: QDS-8096
Change-Id: I07dab4c9cefa241ca5f22e32e6a53e85c31aa252
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-07 11:56:18 +00:00
Robert Loehning
176df5827e SquishTests: Fix tst_CSUP04
Change-Id: I4d9546c13451d8e56a1bc616c3ac8a7640db3204
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-07 11:41:46 +00:00
Robert Löhning
724d275f4f SquishTests: Update tst_QMLS01
Change-Id: I8313aa6dbd9120341bcd9eee7b8d7c72f051a9b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-07 09:50:04 +00:00
Eike Ziller
5335de2669 German translation: ExtensionSystem
Change-Id: Ia74823094434138889bf6699283e183a925584bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-07 06:50:08 +00:00
Christian Stenger
c4204f6eaa Core: Silence wizard handling
The way wizards get created has changed. Originally the
factory had been able to return an empty list in case something
was wrong. This list's items had been processed. Now it just
returns a nullptr for each item as they get processed now one by one.
This triggers soft asserts when e.g. having only a subset of
plugins loaded like when running plugin unit tests.
Amends 1cf6b031cf.

Change-Id: Ia91df462ea52efe301c2dca07bc69aeb2f569b78
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-07 05:59:57 +00:00
Björn Schäpers
f4545807de clang-format: Adapt to LLVM 16
Change-Id: I2e35f92db6de10b1e4bf173f0864f0cd893a011f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-06 18:56:32 +00:00
Christian Kandeler
ed33e2bfb5 Update qbs submodule to HEAD of 1.24 branch
Change-Id: I521dd1cd921197392b359aee8e3b9fb9546a6cbd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2022-11-06 13:16:56 +00:00
Sivert Krøvel
572747db37 McuSupport: Make legacy kit creation match QtCreator 8
The default path for the STM32 Cube Programmer was recently changed for
legacy packages. This means that Qt for MCUs 2.2 kits created with
QtCreator 9 and kits created with QtCreator 8 would have different
paths. This is not ideal as a basis for automatically creating new
kits when changing Qt for MCUs version.

This change makes QtCreator 9 create legacy kits in the same way
QtCreator 8 did.

Change-Id: I8b1fa4a0d673f746edf058aee292e6d42ca2cdcf
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-04 16:28:09 +00:00
Sivert Krøvel
6d992c9f3c Revert "McuSupport: CMake expects programmer path to include the bin folder"
This reverts commit e558fc4d1f.

Reason for revert: Because this is incompatible with how QtCreator 8
makes kits, it breaks the kit when changing versions. A fix for the
original issue was made in Qt for MCUs to accommodate not having bin
the path, allowing the detectionPath to be bin/... in matching with
legacy code.

Change-Id: I64c670398287b3ec9beec0aa6fac02325b322664
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-04 16:27:58 +00:00
Sivert Krøvel
6aaf33bee5 McuSupport: Do not update paths in kits for different SDK versions
When updating paths for a target in Devices > MCU, the paths were
updated in the corresponding kits for all Qt for MCUs versions.
This would break existing kits made for a different version than
the currently active one.

With this change, only kits made for the same SDK version as the
currently selected target will be modified.

Task-number: UL-6755
Change-Id: I6fda050094b5603914fbbc29a5fc2e83d974a2d6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-04 14:56:49 +00:00
Amr Essam
f4723ae885 QmlDesigner: Show proper warning if .qep file has no component
When dragging an empty effect, a messagebox shows with an option to open QQEM

Task-number: QDS-8155
Change-Id: I2afbf7ffb9cb58243f3635fe3a7aee999ab68713
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-04 12:56:42 +00:00
Eike Ziller
7203d6d44b German translation: Bookmarks
Change-Id: I4ee0d059d30b99742a1706e6e5769e71251ae6b7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 12:17:18 +00:00
Eike Ziller
79781f05c4 litehtml viewer: Show link targets in tool tip
Like done for the other backends.

Fixes: QTCREATORBUG-23027
Change-Id: Idc1f7ee2f6240e6c488a9d7d65ead3be6846d303
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-04 12:16:48 +00:00
Eike Ziller
ead9dd987f German translation: Core plugin
Change-Id: Iec22406e32a21c58629889361fba22f0278da5b1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:54:21 +00:00
Eike Ziller
935f2e5d5e German translation: Help plugin
Change-Id: I555c20649ed838c08a074c76f78ba10a310c53a9
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:52 +00:00
Eike Ziller
e19c80b2c0 German translation: UpdateInfo plugin
Change-Id: I0dc74089a67245d2c7ec1ebcaf17acd848625037
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:36 +00:00
Eike Ziller
6401479dfd German translation: lupdate ts file
Result of `cmake --build . --target ts_de_cleaned` in the build
directory, in preparation for translations.

Change-Id: I9cf3b1aa08244e157e784ae148ed9b1dd308adb5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-11-04 10:53:20 +00:00
Yasser Grimes
3c6a40b30e McuSupport: Support expanding multiple wildcards in a path
To support defining default paths such as "Microsoft Visual Studio/2019
/*/VC/Tools/MSVC/*/bin/Hostx64/x64"

Change-Id: I889439a0f2a05b15121a28fbf2b50acde2e74968
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-04 10:33:57 +00:00
Marcus Tillmanns
7e0d545e64 Utils: Allow mimetype deep-scan for remote files
Text editors need to know the actual mimetype of a file to be able to
open the correct editor view. Just checking the extension is not
enough. Especially on linux there are many text files without
an extension.

Change-Id: I7e5c935b0619f5d86e97f10bfd7ff9b65da62f4b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-04 09:52:15 +00:00
Miikka Heikkinen
e8899baa21 QmlDesigner: Add support for CubeMapTexture to NodeMetaInfo
Task-number: QDS-8169
Change-Id: I326708ef17325acf1731a285f4e4f387ba4f95fb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-11-04 08:55:32 +00:00
Thomas Hartmann
3726caa5de QmlDesigner: Add option for layer.effect when creating effects
Task-number: QDS-8162
Change-Id: I9b98d4ae264f4b6a703eb5bfdeb6e1fb546e5a37
Reviewed-by: <amr.elsayed@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-03 16:59:17 +00:00
Ali Kianian
08f5a92bac QmlDesigner: Add Paste to 3d Context Menu
Paste action is added to the context menu of the Edit3DWidget.

Task-number: QDS-8063
Change-Id: Ic4e4a58b51ca297536c72f15400f3c6ecd87d84a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-03 16:16:01 +00:00
Miikka Heikkinen
f113b05530 QmlDesigner: Reset possible imports on all open documents
DocumentManager keeps track of other documents besides the currently
open one. All of those documents can have RewriterView instances.
Possible imports need to be reset on all of them instead of just
the current one.

Fixes: QDS-8109
Change-Id: I18b5c2690d1a33f2605db94d39fda7b7a9b200e2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-03 14:55:59 +00:00
Marco Bubke
e3bf172585 QmlDesigner: Handles directories in Project storage updater
All directories are searched for qml files and they are added to the
meta data. If the directory is changed the qmldir is always parsed even
if it was not changed. We can optimize that later but I think there is
no big advantage fot this optimization.

Task-number: QDS-5297
Change-Id: Ibe3102520bc18ac474380aad306486d8e25bc5db
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-03 14:47:50 +00:00
Miikka Heikkinen
a8c5cbaf94 QmlDesigner: Remove duplicate include
Change-Id: Idac5b8882a050ecb2c03cdfad644a16f5ce240dc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-03 14:46:23 +00:00
Tim Jenssen
40072fb5c7 Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b
2022-11-03 15:32:29 +01:00
Marco Bubke
f51162a3fe QmlDesigner: Improve ownership of QmlProjectItem
Change-Id: Ibfe4b0b5314dada85a601a8f27003af135df78f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-03 12:58:21 +00:00
Daniele Bortolotti
8de9892c4e McuSupport: Improve message box warning
The message box might show up when applying changes in other settings
pages if the user left the Devices > MCU tab with invalid fields.
Improve the warning message with settings page and target name.

Change-Id: I335fadd3b5d4c6be10c6bd5100d6aac3c50017f2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-03 12:28:20 +00:00
Thomas Hartmann
318a2aff2f QmlDesigner: Enforce rules for QML component names
Since a QML component is generated from the effect,
the same rules for names should apply.

Task-number: QDS-8152
Change-Id: I607c2771401fec2259b1e1aac9a37707aa1328b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-03 10:54:18 +00:00
Thomas Hartmann
7b9303007a QmlDesigner: Avoid error messages when adding effect
* Removing the summary page
* Adding DoNotOpenFile option

By default, the wizard expects to open a file.
Setting DoNotOpenFile to true does suppress this.

Task-number: QDS-8151
Change-Id: I62264733788dbbe1b017beaa428356548a1a3692
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-03 10:53:50 +00:00
Marcus Tillmanns
0d1e1ebab6 CorePlugin: Do not check recent files for existence
Previously recent files would be restored before devices were
intialized. Remote paths would therefore be removed since their
existence could not be verified.

Change-Id: I0412cec9587fd104580a694f20bdd0ec54e35b3e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-03 08:51:35 +00:00
Jarek Kobus
e7b1561cc7 CorePlugin: Don't leak actions for options
Amends d86a67e0bc

Change-Id: I45703f4fbc018f1f30375e578aa6c55815db902b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-02 14:37:24 +00:00
Jarek Kobus
3bfebea981 LocatorWidget: Don't leak m_centeredPopupAction
Amends d3354d1999

Change-Id: I9cd308c83300928e8dafade291ee4559f885ab5f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-02 14:35:39 +00:00
Sivert Krøvel
8fa0c2c390 McuSupport: Implement support for parsing path type from json
The json kit files have an entry named "type" which is intended to
specify whether a specific path points to a file or a directory (or
something else). Until now, this entry has not been handled and all
lineEdits expect a path, thus appearing red in the UI if supplied with
a file. With this patch, support for the type "file" is added, with the
possibility to support further types in parseLineEditType.

Currently, only File and ExistingDirectory are supported, with the
latter being used by default whenever no "type" entry is specified.

Task-number: UL-6610
Change-Id: I252d4eff76d4a11b92ce55a0c0964446072e48c1
Reviewed-by: Daniele Bortolotti <daniele.bortolotti@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-02 14:00:36 +00:00
Thomas Hartmann
73cdb6239d QmlDesigner: Show Effect wizard only in enterprise version
Change-Id: If0c99beec083514ed5c531bb7a67cd7a392c3108
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-02 12:44:56 +00:00
Jarek Kobus
2c04c644d0 TreeScanner: Pass a copy of filter and factory into async call
Otherwise, m_filter and m_factory may be used from 2 threads
at the same time, what is not thread safe (setFilter() /
setTypeFactory() from caller thread, and copy of m_filter and m_factory
inside async call body).

Change-Id: Ic322870f9c27de10c5c51082cfbb85c729326993
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-02 10:40:28 +00:00
Henning Gruendl
118d9d43d2 QmlDesigner: Rename default state group
Rename default state group from "Root" to "Default".

Change-Id: I69527218f38fcfaf0ceb56ce211ffddeca7fae3f
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-02 10:38:32 +00:00
Ali Kianian
e979579af5 QmlDesigner: Add Edit Component Action to 3d context menu
Edit Component action is added to the context menu of the Edit3DWidget

Task-number: QDS-8063
Change-Id: I99983004c3816b1230169300ccdf2c3c92f07cd0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-02 10:32:12 +00:00
Thomas Hartmann
b1c48a27c0 QmlDesigner: Move effect wizard to qmldesigner/studio_templates
This is the folder QDS looks for the wizards.

Change-Id: Id69f50f48eeb4668dff2840a36149408e0709a06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-01 19:14:08 +00:00
The Qt Project
648fe3160f Merge "Merge remote-tracking branch 'origin/8.0' into 9.0" into 9.0 2022-11-01 15:48:26 +00:00
Yasser Grimes
71ae73119e McuSupport: Support globbing in default paths
With this change default paths containing globbing characters will be
expanded to an available path.
example:  "sdk-*" will be replaced with "sdk-1.2.3" if the latter is
available.

To test the wildcards and make sure it works with QtCreator macros
a fake_kit was added containing fake packages.

Task-number: QTCREATORBUG-26900
Change-Id: I31440d24e42a6170fc5f1905f884bb3be43c57bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-01 15:11:14 +00:00
Ali Kianian
3897d917e2 QmlDesigner: Add camera-view align actions to 3d context menu
The following items are added to the context menu of the 3d editor:
    1. Align Camera to View
    2. Align View to Camera

Task-number: QDS-8063
Change-Id: I7b5b966aba2b5e96b7cd4d8a88cf4e7db8cdc0ac
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-01 15:04:39 +00:00
Thomas Hartmann
0dfd2a2b09 QmlDesigner: Reactivate nodeinstance cache
Reactivates the node instance cache and fixes update issue.
The formeditor relied on instanceInformationsChanged being
emitted after attach. The cache is setting the values already
before the attach, so instanceInformationsChanged was never called
in this case.

Task-number: QDS-7642
Change-Id: Ibeb687c7483905e7df97e4342a6c8542b66b7ab0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-11-01 14:58:40 +00:00
Miikka Heikkinen
9c3df49ca8 QmlDesigner: Fix memory leak in 3D view context menu handling
Change-Id: Id0521945a8c29019000d41ffee7724336029c96e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-01 14:49:20 +00:00
Eike Ziller
b402f35481 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
2022-11-01 15:38:49 +01:00
Daniele Bortolotti
e16a5c8d0e McuSupport: Update test json headers for TraveoII board
Reflect changes in QUL repo that allow for correct SDK and GHS compiler
version detection.

Change-Id: Ibc54f45ef214227db5681c33b3278dc52f5bdde6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-01 13:56:48 +00:00
Daniele Bortolotti
7fa756663c McuSupport: update default MCU project template (qmlproject)
The QmlProject example template is too small for high-resolution
displays, so remove hardcoded width, height and increase font size.

See: QTCREATORBUG-28159

Change-Id: I67a02c2ffe8d6e54f633f1061062459ecaac0e56
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-01 13:56:12 +00:00
Tomi Korpipaa
02f7c9c3eb Import QQEM effects via drag or add button
Be able to add effects using file system drag&drop or using the add resource button

Task-number: QTBUG-100626
Change-Id: I33c3ebe29797325a2ed1819bd867e97ae3f8b61c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-01 12:55:28 +00:00