Commit Graph

76686 Commits

Author SHA1 Message Date
Henning Gruendl
754be28e36 QmlDesigner: Fix state shown after reordering
Fix an issue which caused the wrong state to be shown in the form editor
after reordering the states in the state editor.

Task-number: QDS-7753
Change-Id: I220bb5b11beb4f9bfc6a85069a688c9ff2984d8f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 20:24:56 +00:00
Marco Bubke
3a102f433d QmlDesigner: Move view manager to components core
The view manager has dependencies on many components so it should be
part of the componets core.

Change-Id: I68d233ca51625f38ed6c30601ec630782dcdf487
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 19:27:35 +00:00
Marco Bubke
0be4de69d8 QmlDesigner: Remove parent from abstract view
We apply not very often the parent to views. So it can lead to dangling
pointer if the parent is used by other objects and does not handle the
null pointer case. It can lead to double deletion if the parent is
deleted before the object when it is on the stack or handled by smart
pointer.

If you really want to use it there is still setParent.

Change-Id: I1fc6b145a50f037a0e9d415fb36e7970ea7296ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 19:08:12 +00:00
Marco Bubke
4bb4e07ad8 QmlDesigner: Inline SynchronizeCommand
Change-Id: Id030fb6aba7f1ba61ce97ebebb5e91a809ab6d8d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 19:06:21 +00:00
Tim Jenssen
1518a74dff qmldesigner: fix crash
Change-Id: I0b141fc707f9db686144c7d19572771e83ca5f55
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-09-22 18:31:18 +00:00
Marco Bubke
68f27f3f04 QmlDesigner: break dependency to Core::IContext
Move the dependency from the abstract view into the plugin class. The
abstract view is now only returning the id.

Change-Id: I4f508c907bcdc8f717817fd40ef9c933e5fe2211
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-09-22 17:00:32 +00:00
Marco Bubke
1669f3996c QmlDesigner: Add showException callback
Breaks the dependency of the exception to the messagebox.

Change-Id: I836f87704f68c9dc98dfb5cdf9eafe86b42892d6
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-09-22 16:52:39 +00:00
Marco Bubke
6822b2f04a QmlDesigner: Use new validation approach in 3D editor
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I447e106d1b5deb3af92046c6ee8907341c7d5220
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 16:45:09 +00:00
Alessandro Portale
0a6523e7f1 QmlJSEditor: Convert to using Tr::tr
Change-Id: I7e6bc774cdac0ead8ef944a46db120d290419f18
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 16:37:56 +00:00
Marco Bubke
016fb66c96 QmlDesigner: Cleanup QmlTimelineKeyframeGroup
Many checks are not anymore need so we can just remove the code and make
it clean what we want. Use the filtered algorithm to remove some loops.
We add Utils::filteredCast to algorithm.h to return a different result
container and let it be cast in std::copy_if.

Change-Id: I114c17cd2d5a69c9ebbfbd804805c4d2fa0599e1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 15:26:00 +00:00
Brook Cronin
e28810b50c QmlDesigner: Fix Scrollbar size and colors
Task-number: QDS-7741
Change-Id: I013fcfe1c80ef637388af190d27c4954be650d86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 15:19:31 +00:00
Marco Bubke
8e0c09a35e QmlDesigner: Fix merge conflicts
Task-number: QDS-7672
Change-Id: Iec15fc216c046aebeb5134d1393edb10ea7c19d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 14:35:59 +00:00
Marco Bubke
57983a97a2 QmlDesigner: Add more node metainfos
Added font, texture and vectors to node metainfo and model. Extend
isBasedOn to 7 parameters too.

Task-number: QDS-7672
Change-Id: I3272fab48a8172c533c9cec0559eb412c3eddbe1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 14:35:54 +00:00
Marco Bubke
828119e308 QmlDesigner: Use new validation approach in material editor
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I9c93498b96c1f1facd72a98d58751d3ad031c483
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 14:34:15 +00:00
Marco Bubke
7b7b3b3833 QmlDesigner: Use new validation approach in components plugin
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I93fa7cf36f1764cd857770ae4dcaac28b06445ac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 14:14:41 +00:00
Marco Bubke
2d1d263bad QmlDesigner: Use new validation approach in navigator
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: Icfdf53cbf02a08e8922258b4bd93ebb4cf3d2e64
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:13:27 +00:00
Marco Bubke
441cc6de08 QmlDesigner: Use new validation approach in item library
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I84d5330d2666968eec757f70eceb73b45ce72383
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:12:11 +00:00
Marco Bubke
bc42c618e1 QmlDesigner: Use new validation approach in integration
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I04a800edab774604d825d53a368d05b8520f9e22
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:11:39 +00:00
Marco Bubke
578c6483b7 QmlDesigner: Use new validation approach in NodeInstanceView
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: Idb93b565415ea715db143b292988679c221b2a5a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:10:35 +00:00
Marco Bubke
e6a74d8d13 QmlDesigner: Make variables compile time constant
Change-Id: I5ef7a3cc1f3d070482311993a9ac9e9e68faa905
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 14:09:03 +00:00
Marco Bubke
96f0a7ae1b QmlDesigner: Remove static keyword for for internal linking
From cppreference:

internal linkage

The name can be referred to from all scopes in the current translation
unit.

Any of the following names declared at namespace scope have internal
linkage:

* variables, variable templates (since C++14), functions, or function
  templates declared static;
* non-volatile non-template (since C++14) non-inline (since C++17) non-
  exported (since C++20) const-qualified variables (including constexpr)
  (since C++11) that aren't declared extern and aren't previously
  declared to have external linkage;
* data members of anonymous unions.

Change-Id: Ibbd7c3925ead59879039d4b266ebfda548c68744
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 14:08:39 +00:00
Mahmoud Badri
1664a5f4e2 QmlDesigner: Remove "Material" word from the bundle material instances
TO save space and make material names clearer.

Change-Id: I1cea8787ca03a37adca6e4a0f352732d50bc1b40
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 13:43:45 +00:00
Marcus Tillmanns
852ded54d0 DeviceShell: Test no-script fallback
Change-Id: I97f6df6face701b247b6be3320d89511a1310857
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 13:36:03 +00:00
Vikas Pachdha
0ae9b14911 Export StyleSheetMerger class
Used in assetImporter plugin

Task-number: QDS-7652
Change-Id: I2caff28f6a9effbcb2312f120f2ccdc2d0a82a86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 13:32:49 +00:00
Mahmoud Badri
70c4acae67 QmlDesigner: Avoid duplicate bundle material instance creation
When apply a material from the material bundle directly to a model in
the 3D scene, check frist if there is an existing material that has no
properties set, if so apply it instead of creating a new instance.
Also few tweaks.

Change-Id: I4ddadfd84442164b671645af5e4f5d9e8dcb7cb0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 13:31:17 +00:00
Christian Kandeler
0f7a539262 CppEditor: Let user decide whether to use "auto"
... in "Assign to Local Variable" quickfix.

Fixes: QTCREATORBUG-28099
Change-Id: I3640ef3d1e069bb2cac4d78f0ae60726b131c4fe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 13:26:20 +00:00
Christian Kandeler
a8397c129f CppEditor: Fix missing editor defines on session load
The CppSourceProcessor initially expects the "<per-editor-defines>"
pseudo-file in the working copy and then puts the resulting document into
the snapshot. Therefore, if we reset the snapshot, we must put the data
back into the working copy.

Fixes: QTCREATORBUG-22584
Change-Id: I4e3fd0647cc35327a2e72547c81c4edc16a670b2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 12:30:05 +00:00
Miikka Heikkinen
0371478836 QmlDesigner: Fix bundle imported material's metainfo type
Fixes: QDS-7749
Change-Id: I50993304b3cae7452ff3fcb4d37af0f8663c0199
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-22 12:21:21 +00:00
Christian Stenger
8cfbaa1da9 Squish: Add Create New Squish Suite
Change-Id: I9246f22bb5f4cbccb2fd4d39218e4d6594f88a89
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 12:05:29 +00:00
Jarek Kobus
8d284c222c UnifiedDiffEditor: Refactor internal data
This is a preparation step before making diff showing more
interactive.

Change-Id: I149b76466c3ccce05d823bac91fe89ac806b9130
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-22 11:38:57 +00:00
Christian Kandeler
f50a6b04d8 QmlDesigner: Fix include
Change-Id: I85ae8e863cb297396d05e9934b2208213d51f366
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 11:23:25 +00:00
Christian Stenger
c369e1cc6e Squish: Do not run empty suite
Instead of providing a message box with unrelated information
just refuse the run and inform the user about this.

Change-Id: Ia6feb835dd5d4876abc85d186faf0abe89e5a47f
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 11:11:34 +00:00
Christian Kandeler
a5c0f16d75 CppEditor: Check document before access
Amends f99e17efa4.

Fixes: QTCREATORBUG-28197
Change-Id: I7a3561b5ff5b7635f419f1252595c639fe7254bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 10:56:51 +00:00
Mats Honkamaa
be34449247 Doc: Add info about 3D view context menu
Task-number: QDS-7494
Change-Id: Ic6fce90317e2ff5736ba20996ba30b1f338c36ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-09-22 10:47:44 +00:00
Christian Stenger
17ab933b93 PE: Export generator to make it extendable for plugins
Change-Id: I8f282c7a1d212a2cc863cf5fb246f443442d7e76
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-09-22 10:44:27 +00:00
Christian Stenger
18cdf33863 Squish: Store toolkits inside server settings
Information is fetched anyhow and we need it later on.

Change-Id: I6389c183b584b312559ca44d2fdda856e6315583
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 10:44:21 +00:00
Christian Stenger
63de537505 Squish: Make server settings class accessible
These settings should be usable for more than just the
settings page.

Change-Id: I5150601405163327290808127d761438e57794a3
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 10:44:14 +00:00
Miikka Heikkinen
1f6061e88a QmlDesigner: Reset code model always when importing new bundle material
Apparently we can't rely on code model picking up the import addition
in all cases, so always do code model reset if a new material is
imported from bundle.

Fixes: QDS-7750
Change-Id: Idba05cd9ce0af4165cb933515ada8ed7bd3f64c9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-22 10:27:06 +00:00
Miikka Heikkinen
061ae8b02c QmlDesigner: Delete material properly via material browser
Deleting is now made the same way as deleting a selected node, so
dangling references to the deleted material are removed.

Fixes: QDS-7716
Change-Id: I552c328eb928bfc20e3e33caa0e817f6d22162cc
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-09-22 10:26:55 +00:00
Christian Kandeler
9dcf2bd2c4 LSP: Do not stringify UnknownErrorCode
It looked very ugly in user-facing messages.

Change-Id: I7dfb91435e272b39b64d928dfeba628afba8f3b7
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-09-22 10:19:01 +00:00
David Schulz
e7237a9675 LanguageClient: ensure that deleted clients are untracked in manager
Change-Id: I0624ce9e6f8788af7193ebdf87b72497bab0ba39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 10:07:59 +00:00
David Schulz
1c05237820 LanguageClient: prevent accessing freed data on shutdown
Change-Id: I0d6e7abd653acb2ab7409a9cd5e58a2df3b1f259
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-22 10:07:53 +00:00
David Schulz
d86a67e0bc Core: add commands for settings pages
Makes it possible to assign shortcuts to individual settingspages as
well as opening them from the locator actions filter.

Change-Id: Ief3f0e9144d1338f5ab107203f8fb64bb0c6471a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-22 10:05:45 +00:00
Alessandro Portale
01d27eec6b Utils: Restore original look for non-flat project mode on non-macOS
Amends: 74f5ad6583

Change-Id: Ia38e1d82e59d633506703427ee8352e57cc606dc
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 09:39:04 +00:00
hjk
a35a19d165 Utils: Introduce FilePath::{root,schemeAndHost}Length(QStringView)
Intended as helpers for parentDir() to stop when cutting components.

Change-Id: I7615803743351a733d6f3cc9813e9de85973dc61
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-09-22 09:19:42 +00:00
hjk
dbbfb59ad9 Qnx: Use a bit of LayoutBuilder in QnxDeployLibrariesDialog
Less user code.

Change-Id: Ief2ad4c57a082752551db7db7d0020dd1775c7a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-22 09:19:11 +00:00
hjk
9ac27ad8aa QmlDesigner: Compile fix after source-incompatible changes in Qt
The use of 'auto' here is the simplest way out and should not be
taked a precedence for other code.

Change-Id: I4435e7211139bccfca4b10ed2407ba39afe0b400
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit b852886763)
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 09:18:56 +00:00
The Qt Project
113a011691 Merge "Merge remote-tracking branch 'origin/8.0'" 2022-09-22 09:13:54 +00:00
Christian Stenger
18a464446a Squish: Omit some files when handling shared files
Special files like automated backups of other editors or
files generated by running the tests should not be listed
as shared files.

Change-Id: Ia62ec9e14c6ffd1422705defb680f3232627848b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 08:39:24 +00:00
Tim Jenssen
80e2eddd95 Merge remote-tracking branch 'origin/8.0'
resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
2022-09-22 10:32:40 +02:00