Commit Graph

87591 Commits

Author SHA1 Message Date
Tim Jenssen
7bef3c773a QmlDesigner: fix build on macOS
Change-Id: I7814429f1b1ce04d37c202e3f47f40ab39ad430a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-16 14:44:03 +00:00
Knud Dollereder
b17cd52f84 QmlProjectManager: Generate file to define the default build path
when opening the root CMakeLists.txt with QtCreator

Change-Id: Ia448dab1b3161471fe2bb7870ffb79e68dd579fc
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-16 14:33:45 +00:00
Knud Dollereder
3e42b144ba QmlDesigner: Fix curveditor playhead update issues
Change-Id: I04b3502395f0b0b25bca785acf220f69ba3428bf
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-16 14:11:30 +00:00
Mahmoud Badri
4591293fd9 QmlDesigner: Add user texture bundle
Fixes: QDS-12390
Change-Id: I512a8748bbb6a282589f05293507c110162e7f1d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-16 14:01:58 +00:00
Shrief Gabr
ece3a60cfa QmlDesigner: Prevent QDS crash during asset import in debug mode
Task-number: QDS-12436
Change-Id: I5ecac614faff58a314ec2886730e4d69f717885b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-16 14:01:41 +00:00
Thomas Hartmann
1f4d1a5820 QmlDesigner: Use different changelog path for QDS
* Do not deploy Qt Creator changelog for Qt Design Studio
* Set minimum size on combo box

Change-Id: Ic069c76b5a02963972ec199553ce9e27c820f75a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-16 13:58:47 +00:00
Miikka Heikkinen
8154e4c3d0 QmlDesigner: Fix override cursor on config dialog close in 3D view
Only restore override cursor on dialog destruction if it was actually
hidden by current dialog.

Fixes: QDS-12300
Change-Id: I8789e060244089c7d83e43926f841012602b27a5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-16 13:02:02 +00:00
Ahmad Samir
fcf2d20644 FSEngineImpl: fix the build with Qt 6.7
I, rather naively, cherry-picked the FileTime commit in
QAbstractFileEngine in qtbase, fd295f4bf6002b499f1f238efa5a7c8d9c90be39,
to the Qt 6.7 branch (commit 22d1a437cb4431a3e7ca1bf8e3b6ba4290d0a0cf),
so it will be in effect starting from Qt 6.7.1, which breaks the build
if you're using 6.7 HEAD. Thanks to David Faure for pointing this out in
the code review.

Change-Id: Ia94a75814321c5832099174f9a9c1b47a8cee23d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-04-16 12:16:49 +00:00
Knud Dollereder
e55b5d0a0b QmlProjectManager: Write cmake-generator issues into the issues panel
write qtquickcontrols file if it does not exist
and minor cleanup of the cmake generator.

Change-Id: I9b7523f32e5a9b41904c02a398a6f924623f949a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-16 12:11:34 +00:00
Thomas Hartmann
b5aac705ea QmlDesigner: Indicate if a file is modified
Task-number: QDS-12361
Change-Id: I7a6c5f112b0f193f5bb975a331e2f0d44d19ddc2
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-16 11:59:38 +00:00
Ali Kianian
3f597a5935 QmlDesigner: Modify the model editor files path
Task-number: QDS-12505
Change-Id: Ib35ba7ab8ce3c6a980770bd73385d1afab630a2d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-16 11:22:17 +00:00
Miikka Heikkinen
d385a2350b QmlDesigner: Reset camera speeds when project changes
Fixes: QDS-12297
Change-Id: Ia86f2290cdc94e637b7c12f48b379c429338ff0e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-16 10:52:31 +00:00
Marco Bubke
8ca37a3218 Sqlite: Update to 3.45.3
Change-Id: I8f52308d56619147393238ec04dfedad75d4139f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-16 10:30:19 +00:00
Alessandro Portale
f61ba7c017 FakeVim: Remove unused function warning when building without WITH_TESTS
Change-Id: I33ad1a20046a51c4253056a23d49ac7ddc7a0c54
Reviewed-by: hjk <hjk@qt.io>
2024-04-16 10:17:01 +00:00
Eike Ziller
cf7933a980 iOS Simulator: Fix crash when starting app while another is running
Qt Creator would crash when starting an app in the Simulator while
another app is running, and the old app is not killed by the deployment
before run. This could happen in two cases:

1. Running an app in one simulator device and starting that or another
   app on a different simulator device
2. Running an app in the simulator and starting that or another app on
   the same device without deployment

In the first case, it actually doesn't make sense to stop the running
app, the Simulator can run multiple devices simultaneously (this might
have been different in the past).

In the second case, the new IosRunner initiated a stop of the old
RunConfig, and while that was in Stopping state, the app output window
tried to re-use the old tab and deleted the old RunConfig. This lead to
an assert in the RunConfigPrivate destructor, which only expects to be
deleted when in Initialized or Stopped state, and eventually to the
crash. The app output window should not reuse tabs that are not
"Stopped".

Fixes: QTCREATORBUG-30666
Change-Id: If46904dd487301e465e89ce7946be375ab4bdee8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-04-16 09:58:35 +00:00
Thomas Hartmann
1488548739 QmlDesigner: Fix reflection for CheckBox
Change-Id: Ib0268e5a015fb74c6691e7b3c51ca03f1f90ba55
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-16 09:42:52 +00:00
Miikka Heikkinen
75fc181b34 QmlDesigner: Adjust imported 3D assets path
Path changed from GeneratedComponents/QtQuick3DComponents to
GeneratedComponents/QtQuick3D to avoid repeating Components
unnecessarily.

Fixes: QDS-12502
Change-Id: Ife81acddcd5ade7a23d2388b55416e2688a6828a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-16 09:21:06 +00:00
Cristian Adam
fa29657881 CMakePM: Rename source files in set_source_files_properties calls
Fixes: QTCREATORBUG-30174
Change-Id: I80b33c1193f4cd579abd295657dc223aad5801ea
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-04-16 09:16:18 +00:00
Knud Dollereder
4ee7b297ce QmlDesigner: Adapt wizards to the new project structure
and removed some unused templates

Change-Id: I7e3e4a94ef31cbf5c98a0c1ad26dcaaa340c1e97
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-16 09:08:41 +00:00
Christian Kandeler
e52743ae81 ClangCodeModel: Fix context processor
Checking for potential include file completion should only consider
string literals, not number literals.

Fixes: QTCREATORBUG-30607
Change-Id: Ibfb422f1d8be5a5d30489383ecbc359f5ea4a2a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-04-16 08:30:46 +00:00
Aleksei German
e8a47b1b8a QmlDesigner: Fix Properties Section for Effects
Change-Id: I249723f45b83731232acc9e68a6c4e27b85d6d11
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-15 16:11:44 +00:00
Thomas Hartmann
21f6cbe4e4 QmlDesigner: Adjust paths for new project structure
Before we used "content" but in the new project structure
we will use "ProjectNameContent" to make the uri unique.
First check for "content" to support older project.

Keeping only the implementation in DocumentManager::currentResourcePath()

Change-Id: Ib6b21f52c078fdb9a2ff31c02855754f83741538
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-15 15:14:06 +00:00
Thomas Hartmann
3c13cf9493 QmlDesigner: Use the same location on macOS
Task-number: QDS-9979
Change-Id: I6a706b5325fd74221523cab4f2be838bdd871592
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-15 14:03:40 +00:00
Thomas Hartmann
4b0f31e823 QmlDesigner: Fix crash on shutdown
We have to set the correct onwership.
For objects from C++ QJSEngine::CppOwnership is the default,
unless the object comes from a function like here.

Change-Id: Idc35e2b06656da228a55d78e5b41f84795a8aa6e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-15 14:03:29 +00:00
Thomas Hartmann
3aec095e50 QmlDesigner: Fix crash
Change-Id: I0b2080c19868efd92427f47bd344412e6460e126
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 14:03:19 +00:00
Marco Bubke
8694de43c0 QmlDesigner: Fix project storage build
Change-Id: Id734a9618103e61778a772eeb460c7eeb031f076
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-15 13:54:45 +00:00
Cristian Adam
f76e0de7bc CMakePM: Do not show subfolders for custom source_groups
CMake does have a few default source groups (cmMakefile.cxx):
  this->AddSourceGroup("", "^.*$");
  this->AddSourceGroup("Source Files", CM_SOURCE_REGEX);
  this->AddSourceGroup("Header Files", CM_HEADER_REGEX);
  this->AddSourceGroup("Precompile Header File", CM_PCH_REGEX);
  this->AddSourceGroup("CMake Rules", "\\.rule$");
  this->AddSourceGroup("Resources", CM_RESOURCE_REGEX);
  this->AddSourceGroup("Object Files", "\\.(lo|o|obj)$");

This commit will get Qt Creator to display the actual subfolder
structure only if the CMake setting "Show subfolders inside source group
folders" is set and for "Source Files" and "Header Files" source groups.

Any other source group or a custom source group defined by `source_group`
will not get this treatment, since this what the oder IDEs (e.g. Visual
Studio) and what the users expect to have.

Task-number: QTCREATORBUG-27432
Fixes: QTCREATORBUG-30620
Change-Id: I3c30814df2f76d18ee5fd4fd1356d4dfc4b9b09b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-04-15 13:08:40 +00:00
Cristian Adam
4a95a2d63d Revert CMakePM: Treat all sourceGroups as sourcesOrHeaders project nodes
This reverts commit 973e9dcf90.

Fixes: QTCREATORBUG-30602
Change-Id: I9db6dc6d3fbd7d9a5e48a25bca725a4f86124318
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-04-15 13:08:30 +00:00
Cristian Adam
c431f24816 PE: Allow configuration of default build dir via env variable
This variable is QTC_DEFAULT_BUILD_DIRECTORY_TEMPLATE and can be set in
a <project>.shared file, or in the system.

Task-number: QTCREATORBUG-30557
Change-Id: Ife221b7cfe88f9a6015bd5fb61270d335f65cb79
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-04-15 10:50:26 +00:00
Miikka Heikkinen
401bbae862 QmlDesigner: Remove zoom level from affecting edit camera movement
When moving the edit camera with keyboard, zoom level no longer is
used as multiplier for the movement.

Fixes: QDS-12274
Change-Id: I59c903b73fef095e619cccc36868605b47f9ec83
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-15 10:01:29 +00:00
Shrief Gabr
e5c50c6dea QmlDesigner: Change default view3D id in Extended 3D projects
Task-number: QDS-12351
Change-Id: Ib3ecb8e2f6ca1561819f19001d851b0932e9583f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-15 09:52:56 +00:00
Marco Bubke
b01522f102 QmlDesigner: Skip QQuickItem in QtQuick.Templates
Otherwise we have to QQuickItem meta info objects and that creates bugs.

Fixes: QDS-12460
Change-Id: Iaf76df6671c4ca73913285b78bf1d6408fbe93be
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 09:26:53 +00:00
Marco Bubke
047b2ef361 QmlDesigner: More unique ptr
Change-Id: Iabce3eb5eb8832c0edf8864adeb7d7a56d965a3a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-15 09:26:30 +00:00
Marco Bubke
7883f15299 QmlDesigner: Fix component file path
Change-Id: I9e5f5dc4906c9c498e4a54f92a7d8a105e0399a1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 09:26:23 +00:00
Marco Bubke
316d88bd12 QmlDesigner: Extract default property in qml document parser
Change-Id: I2b3576312cc2bec0c2e103fd3f342a5fe059b10c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 09:26:14 +00:00
Marco Bubke
665d043e72 QmlDesigner: Extract default property in qmltypes parser
Change-Id: I0cc9ac71ba764db252e302d11d1cd3e4aff834f5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-15 09:26:02 +00:00
Marco Bubke
afd1b3b6e9 QmlDesigner: Lookup the default property in prototypes too
The default property can be set too in any prototypes. Look them up
there too. Because it is expensive we cache them in the node meta info
to make hasDefaultProperty() followed by defaultProperty() cheaper.

Change-Id: I3b9ec90fc1bc5f0228dad3b580c335734f03821d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 09:25:51 +00:00
Marco Bubke
db84bc43a9 QmlDesigner: Improve node creation with project storage
The file url was missing, so no valid source id could be created. That
lead to invalid imports.

The qualified path for the node instances is now created in the node
instance view.

Change-Id: I2685ab2fdbdb0fa8a5f89793be52c8fae2b8db8c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-15 09:25:46 +00:00
David Faure
093ec3d34f ModelEditor: Fix crash when selecting an element
Same fix as in commit 22f41fb751
but in a different method.

Fixes: QTCREATORBUG-30413
Change-Id: I69790707005edc26c7d3e943d86db132184298e9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-04-15 09:09:53 +00:00
Thomas Hartmann
c9f9804edf QmlDesigner: Fix getting the bounding rectangle for an effect
When getting the bounding rect for an effect we actually have
to find the item with the effect first.

Change-Id: I4e20f77c6b8dca9d58ccffb42d8b803f57317cb9
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-12 15:39:49 +00:00
Thomas Hartmann
8a21dc325c QmlDesigner: Fix DesignerEffects rendering
The property name changed and we adda bit more padding.

Change-Id: I9432f3d5a053d38feb32649be52a99696a9f3b6c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-12 15:39:41 +00:00
Thomas Hartmann
36f666174f QmlDesigner: Add import for DesignEffects
Change-Id: Ib6a2c8bd8e6d04fe532fe524225d501c40a7a042
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-12 15:39:30 +00:00
Thomas Hartmann
97def66414 QmlDesigner: Properly parse properties
Checking here for the property name was wrong since,
we only want to skip conversion for property changes, list elements
and connections.

Task-number: QDS-12482
Change-Id: Ibff7164b8c3a28d50c483da256450a661a472bb7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-12 14:52:10 +00:00
Miikka Heikkinen
3700eac9f3 EffectComposer: Remove invalid properties from effects in use
When effect is saved, the properties it exposed can change if nodes
are deleted from the effect. If any of those removed exposed properties
was assigned a value in the scene, those property assignments are
removed from the scene.

Fixes: QDS-12359
Change-Id: Ia3840584c6361b9e140c6840ff8fa3036c1b7d93
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-04-12 14:03:49 +00:00
Miikka Heikkinen
a5335f5371 EffectComposer: Remove use of native separators from file paths
Using native separators causes soft asserts in FilePath.

Change-Id: I45c5002a555a21dd3780ffd5c8df91b849a67c18
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-12 14:03:41 +00:00
Thomas Hartmann
b0eccd58f5 QmlDesigner: Fix bindings
Task-number: QDS-12471
Change-Id: Ie172b966db0e15f73868542502313f6460137543
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-04-12 12:56:21 +00:00
Christian Kandeler
25d6c4f4e9 Utils: Fix focus handling in EnvironmentWidget
Amends 8ef85e481a.

Fixes: QTCREATORBUG-30640
Change-Id: If768a0b75aa7ff2bb02d538c446d5bed64e5dc60
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-04-12 12:20:17 +00:00
Teea Poldsam
68cb22de52 Doc: Add info about editing view3D from 2D view
Fixes: QDS-12464
Change-Id: I0031203590b14b07e7162fc42e409ce0789f76c5
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-04-12 12:03:38 +00:00
Jussi Witick
0b2759a48f Fix QSR wizard cmake-project template
Latest changes to QSR tooling added limit checking for certain properties,
so the cmake-project template needs to be updated slightly.

Additionally remove the import versioning.

Task-number: QSR-2398
Change-Id: I55542c9fd74ebd950b6aeb9b64a22dde177c5a4f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
(cherry picked from commit 574ad7a4a2)
2024-04-12 09:51:29 +00:00
Knud Dollereder
2c18039de8 QmlDesigner: Allow negative values in the "Edit Keyframe" Dialog
Fixes: QDS-11842
Change-Id: I03d61549d0a0155b48381f00ccdf93dfe97126cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-04-12 09:50:05 +00:00