Commit Graph

85691 Commits

Author SHA1 Message Date
Thomas Hartmann
b0a9481049 QmlDesigner: Remove qDebug from ConnectionView
Change-Id: I495525286ff96331ce560d468bf1445fcf7a061e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-15 11:59:08 +00:00
Henning Gruendl
6d5ceadccf QmlDesigner: Improve type selection
* Disable custom item in Connection Editor type selection
* Rename Unknown to Custom

Change-Id: I9fa8c9ab6284503d5ccc61813454b9d10f291a06
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 11:33:49 +00:00
Henning Gruendl
5ed667c554 QmlDesigner: Add chevron to items with children
Add chevron to the ItemDelegates of the SuggestionPopup if items have
children. This indicates that the user can click on it and go deeper.

Change-Id: I905769b8190b81a92025861a3fc38817de5b56ed
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 11:33:41 +00:00
Thomas Hartmann
fc981ee54a QmlDesigner: Fix crash
Check for existing device.

Task-number: QDS-10137
Change-Id: I00065b63f09fb5691c52acaefd75fee0c4315d75
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-15 11:21:25 +00:00
David Schulz
aab39532f3 TextEditor: Collect the comment position setting from highlighter
Change-Id: I802b9e263a3515fe340459329a8c8d8f309cfa0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-09-15 10:50:44 +00:00
Christian Kandeler
b9191e9d15 Update qbs submodule to HEAD of 2.1 branch
Change-Id: I3435d412498021ab432aeb9f295d25846d39a0ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-15 10:46:28 +00:00
hjk
de42485b8f Core: Cosmetics and unused #includes
Change-Id: I5838b7340b9f5fca6d43a49026c8fc82f0d0a494
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-09-15 10:32:57 +00:00
hjk
4ecf769293 Core: Remove SettingsDatabase QObject base
Was not really needed except for the ownership.

Change-Id: I88e32123cbb85a8217ade9450b5b578845736311
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-09-15 10:32:44 +00:00
hjk
680d77bc35 Core: Remove some unneeded #include
Change-Id: I642b578964ee18677d344201e47ba45312938807
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-09-15 10:32:32 +00:00
Alessandro Portale
c9eeca39d0 AdvanceDockingSystem: Skip, if QuickWidgets is not installed
If Qt is built without QuickWidgets, skip building the ADS library.

Change-Id: I0b31de0ba7f1f7c6dcb19e5c75f2345acca48416
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-09-15 10:11:28 +00:00
Andreas Loth
cddc4b3d32 Axivion: Use QUrl.resolved to build path instead of string concatenation
Change-Id: I1e80cc83bd7fcf2ede34bff6764ff3af4d89aac6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-09-15 09:26:23 +00:00
Tim Jenssen
da63a14481 Revert "Tests: Fix cmake build"
This reverts commit a263d3de89.

Reason for revert: QmlDesigner dependency was wrong

Change-Id: I2b67861ab81720649394045b68e2476bb51dd333
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-15 09:25:12 +00:00
Christian Stenger
6233c8ce80 Qbs: Fix build after DS merge
Change-Id: I5188d1654584ba88789472fe1f0c81b2b1a33a55
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-09-15 08:54:43 +00:00
Christian Kandeler
d46cd711d3 Update perfparser submodule
Change-Id: I68a4f5475eb150431203aca1ce74ef21bf510b08
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-15 08:42:02 +00:00
Miikka Heikkinen
ac6d875d12 QmlDesigner: Display informative string for 3D support in Qt5 projects
Fixes: QDS-10661
Change-Id: I91ba32e478039711758e19c11d385af9fac4c99f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-09-15 08:28:22 +00:00
Alessandro Portale
601ab522a2 ScreenRecorder: Show a ComboBox with display names instead of a SpinBox
This turns the IntegerAspect into a SelectionAspect. Easy.

Change-Id: I421765e6c6c81759f31e3c8e3781170c1fd1fbc5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-09-15 07:25:29 +00:00
Alessandro Portale
7de9667a7f Themes: Update DS* roles for all non-QDS themes
Update non-QDS "dark" themes with DS* values from "design".
Update non-QDS "light" themes with DS* values from "design-light".

Change-Id: I7561d5f9e5ad22cd791b5d9772a3ad2f7c2bb399
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-15 07:20:29 +00:00
Marcus Tillmanns
7b3dbfc21f CompilerExplorer: Fix load/save
Change-Id: I2bc1bdbab73b37a5af9bc1fcd040c8ec0c7f363a
Reviewed-by: hjk <hjk@qt.io>
2023-09-15 06:26:49 +00:00
Marcus Tillmanns
16f7652717 Utils: Add AspectList::addToLayout
Added a new, clean IconButton that mimiks the ToolButton
with the compact/relaxed background.

Change-Id: I582c6aac404724af5459bab2ca9023aa63171f93
Reviewed-by: hjk <hjk@qt.io>
2023-09-15 06:26:42 +00:00
Marcus Tillmanns
85f00b243f Utils: Fix DeviceShell error handling
Change-Id: I5e519ffa9672841d84e565ea5fd222d21ca354bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-09-15 06:26:30 +00:00
Marcus Tillmanns
26b436f46f Utils: Fix constness in AspectList functions
Change-Id: I960e02e1a193856de3ed0e090fdf694884a28ac5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-15 06:25:22 +00:00
Cristian Adam
78f89fc777 CMakePM: Proper support for Unity builds
A Unity build can be enabled by specifying CMAKE_UNITY_BUILD set to ON
globally or per target bases via the UNITY_BUILD property.

CMake would then add unity_NN_[cxx|c].[cxx|c] sources files that would
include the existing project files.

The existing project files would then be added as "headers" to the
project and exported via the CMake file-api.

This patch makes sure that these new "headers" are added to the Qt
Creator's code model and have proper syntax highlighting, be available
to plugins (e.g. Todo) and so on.

Fixes: QTCREATORBUG-23635
Fixes: QTCREATORBUG-26822
Fixes: QTCREATORBUG-29080
Change-Id: Ie8dd542504f632c01f91691f8736e51be8b19a01
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-14 18:10:27 +00:00
Cristian Adam
4d358ae337 CMakePM: Jump to function/macro/option definitions in CMake editor
Fixes: QTCREATORBUG-25523
Change-Id: If9ab6651a858e5fa08e8a1c321cb1f757831e14a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-09-14 18:10:22 +00:00
Henning Gruendl
6fbf77b027 QmlDesigner: Fix open/close Connections Editor
Improve the selection mechanism in all 3 Connections Editor tabs. When
a new item is added automatically select it and open the popup. When the
current item is removed, close the dialog. When the dialog is closed
deselect the item.

Change-Id: I918bbff6b290b38d496de8c2fa5f31d617f4d21c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 17:17:28 +00:00
Thomas Hartmann
32f8fc4311 QmlDesigner: Show dot properties if combobox is used
Change-Id: I3ea4539f178349551854843838948bf02740eb5b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 17:17:15 +00:00
Aleksei German
26ac6c2606 QmlDesigner: Integrate Editor into Connections
Task-number: QDS-10530
Change-Id: I579c5e5d55b2136b96e32a448315dda8e720f2fb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 17:16:47 +00:00
Knud Dollereder
3a7f41b78c Prevent creation of nonexistent binding expressions
Change-Id: Id6f9f35cd40667d694fcdf06d51c4642ae71afcd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 17:09:42 +00:00
The Qt Project
8f2221cee8 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-09-14 15:41:22 +00:00
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
Henning Gruendl
9be23b73ea QmlDesigner: Align code preview properly
Change-Id: I05599041b69edf7c8ecaeeff0144d1a4ed6117c3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 15:04:21 +00:00
Alessandro Portale
b5684ee490 Utils: Fix warning regarding incompatible signedness
Change-Id: I0b035ec53d65d636ace121d0d155249eebad2f8d
Reviewed-by: Xavier BESSON <developer@xavi-b.fr>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-14 14:37:15 +00:00
Eike Ziller
e76ec76c0f Remove unused variable
Amends 7f908d737b

Change-Id: I5e28f850c6a4d836ba7c48bd117a91aab64f478c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-09-14 14:35:25 +00:00
Christian Stenger
1701172c30 SquishTests: Fix opening cascaded menus
Change-Id: Ieae5d24f60b9e67c602dbf43737ee3a712a7908c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-14 13:27:30 +00:00
The Qt Project
3473d9d388 Merge "Merge remote-tracking branch 'origin/11.0' into qds/dev" into qds/dev 2023-09-14 12:52:09 +00:00
Miikka Heikkinen
2598e788cc QmlDesigner: Block import of 3D types for Qt5 projects
Quick3D is not supported anymore for Qt5 projects, so we shouldn't
allow 3D imports, either.

Fixes: QDS-10662
Change-Id: I40da07a67e57527c7ad85443f2463e3f7783693f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-14 12:43:23 +00:00
Tim Jenssen
a603b65f18 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
2023-09-14 12:23:01 +00:00
Christian Kandeler
93273af6dc qbs build: Move pluginjson replacements property to the module
... where it clearly belongs.

Change-Id: I22d098b701e4921cde53ab34d11ab0078326ab94
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-14 12:21:46 +00:00
Miikka Heikkinen
77a1c0fb15 QmlDesigner: Allow snap back to 0 rotation during drag
Start rotation should be restored when desired angle for rotation is 0.

Fixes: QDS-10652
Change-Id: I8e733b714f6a0f14561c270aefc5049bdfaff39e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-14 12:19:19 +00:00
hjk
b5b61480bd Core: Code cosmetics in saveitemsdialog.cpp
Including removing one use of QDir::toNativeSeparators()

Change-Id: I5c1fe7733942d6161bd9dda94195a44c0cfded72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-14 12:06:54 +00:00
Yasser Grimes
7295bc96cc McuSupport: Make QmlProject c++ interfaces accecible to the CodeModel
QtMCUs relies on the QmlProject file to list c++ interfaces that are
available as components in Qml, roughly similar to qmlRegisterType.

Prior to this commit there was no possible methode for QtCreator to
know about thos c++ interfaces so whenever there are used "Uknown
Components" error is shown.

After building the project qmlprojectexporter through
qmlinterfacegenerator generate Qml files for each .h interface in the
"CMakeFiles/<target>.dir/*.qml" or ".../<target.dir>/<module>/*.qml"

To make those documents available we make use of CustomImportProvider
imports: for all importable qmlproject modules
loadBuiltins (new): for documents that should be available implicitly

for both the signatures is changed as all created documents require the
snapshot object (insert functioin) to bound their lifetime to the
snapshot as they are created as shared_ptrs.
duo to passing snapshot as copies between threads, storing those
documents locally will cause QtC to crash

Task-number: UL-6167
Change-Id: I09781f6d4b62b203944bf30ab322502d25263b56
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-09-14 12:02:10 +00:00
hjk
0b08a9752a CompilationDBPM: Remove some unneeded #includes
Change-Id: Iaccd053b12c440b07b7f07cdba70cf05ace1b03c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-09-14 11:49:10 +00:00
Marcus Tillmanns
d44afce0f0 Utils: Add AspectList aspect
Change-Id: Id164828f4ba46c973edbcd123c855bb7b70ad8f7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-14 11:37:10 +00:00
hjk
8627dab89d Cplusplus: Remove an unneded #include
Change-Id: Id9dbc15a60397daf651f80f48811fcc05de096d2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-09-14 11:32:50 +00:00
hjk
efb93d1366 CMakeProjectManager: Remote-ify CMakeFileCompletionAssist implementation
Change-Id: I18aa3d23244dd6475657f43bc18ce83298e278bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-09-14 11:27:09 +00:00
Ali Kianian
4b1862fdb1 QmlDesigner: Flash transient scrollbars only when they are enabled
Visibility has a more complex definition in transient scrollbars since
they are transient. Also, it's meaningful when it's disabled, it
shouldn't be flashed. So here we use this ability to prevent them from
being flashed when they are disabled.

Also, the enabled property would be changed instead of the visibility
for the cases that transient scrollbars are out of the scroll area.
(TimelineWidget and TransitionEditorWidget)

Task-number: QDS-10644
Change-Id: If74d71571a216153a2d3aa09694760d7a02026ca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-14 11:04:54 +00:00
Alessandro Portale
726f2730e7 ImageViewer: Fix animation playback replay and loop
This fixes the issue that looped animated images do not automatically
loop and that animations can generally not be replayed from start.

It introduces the "resume" state to the tool bar icon in order to
distinguish between "playing an animation from start" and "resuming the
playback of a paused animation".

The setting cache mode QMovie::CacheAll was removed because it prevents
a looped animation from looping, and also its memory consumption (which
depends on animation dimension and frames) does not seem to be
positively outweighed by anything else.

Fixes: QTCREATORBUG-29606
Change-Id: Iaca8d93766201f5f953784be7ee6d56610e63695
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-14 10:51:35 +00:00
Alessandro Portale
7fc69e1063 Utils: Move CONTINUE_SMALL Icon from ProjectExplorer to Utils
We want a variant of the icon (without the debugger beetle) in Utils, in
order to use it in the ImageViewer plugin to resume paused animations.

Change-Id: I55ff301db60cae626d8e95d2fadf3c76a36cee39
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-14 10:51:26 +00:00
Ali Kianian
252a1f3c74 QmlDesigner: Add a view for single collection
Change-Id: Iee103cf9344872e0f2eaa564fa1feeaea4d26d6a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-14 10:44:05 +00:00
Ali Kianian
f12f3790da QmlDesigner: Implement Collection Editor
Data could be loaded from a csv or json file, and would be appended
to the collection node.

Task-number: QDS-10462
Change-Id: I60294582331ba20eb5ecb5d8fd591055c0eb6d1e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-14 10:43:57 +00:00
Cristian Adam
4f26d802ca CMakePM: Remove support for extra generators
They are marked as obsolete in CMake 3.27 and will be removed in a
future version of CMake.

Fixes: QTCREATORBUG-29603
Change-Id: I6e5d36441d05b87ee4467d13781f53d4269636ad
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-14 10:30:06 +00:00