Commit Graph

8660 Commits

Author SHA1 Message Date
Christian Stenger
73d0c4a29d AutoTest: Tweak Test Case wizard
We now support Catch2 in two different versions which means
we need different include directives depending on the version.
Let the user choose the correct version instead of providing
a fixed one that may be correct or not.

Change-Id: I0199070b4f4602b8e08b7ac60731071f0cd33141
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-20 12:52:05 +00:00
Amr Essam
96dfdfc0b7 QmlDesigner: Fix some parsing issues in effect maker
Task-number: QDS-10987
Change-Id: Ifeb42f9e04ba39ddaa45a03b60eb12ce1652c61a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-20 11:45:44 +00:00
Mahmoud Badri
1d04d50c78 EffectMaker: Add save dialog
Change-Id: Ic538e6c8c9d3ac19bd8726b95d93a9b1f292a437
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-20 11:12:12 +00:00
Jarek Kobus
b3109755e6 Tr: Fix some source texts
Don't use exclamation marks!
Add "the" articles (conforming to the other source texts).
Finish error sentences with dot.

Change-Id: I1faa547e2c3bae90ea900b781eccf327ea810326
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-20 09:07:20 +00:00
Thomas Hartmann
4fbff05a60 QmlDesigner: Add QtQuick3D.Effects to 3D wizard
Change-Id: Id11d4232986c6b390e98740653cf465447d32c68
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-20 07:48:36 +00:00
Marcus Tillmanns
3f647a4bc5 Debugger: Fix lldb fetchFullBacktrace
Change-Id: Ib0a513ecd6c0a0094797fe987aeaddc57d0b5149
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-20 07:43:06 +00:00
Ali Kianian
bf99d08ca1 QmlDesigner: Add edit delegate to the CollectionDetailsView
Delegates are added for the Color, Bool, Number, ad String types.
The default delegate is string delegate.

Task-number: QDS-10989
Change-Id: I7dbaf5451d8be778691e72e18bd3124a754e47b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-19 12:17:05 +00:00
Ali Kianian
709bcd640d QmlDesigner: Hide CollectionDetails when no collection is selected
Task-number: QDS-10621
Change-Id: Ifc5f16f4cffa1e0884394b94456da51505a18b2e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-19 12:16:12 +00:00
Eike Ziller
15d31610ee Tr: Use more arg() and move tags out
Change-Id: I80e28de3add81d0569b87dbb1712229cda5fb42a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-10-18 11:21:10 +00:00
Eike Ziller
64550e1339 Tr: Small fixes like full stops, whitespace and typos
Change-Id: I4d1edba6d28661af3c2255add35141f1e73fc304
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-10-18 11:16:03 +00:00
Eike Ziller
cee8309998 Tr: Parametrize some application names
Change-Id: I5222455d895aecb94c9a96d0a0f4fd7c279a7388
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-18 11:14:39 +00:00
hjk
2886b2b383 Debugger: Robustify gdb stack frame extraction
frame.older() might run into invalid debuginfo and throw.

Change-Id: Iba1d395f21719bf28184302427c7ab2435c6a663
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-18 09:48:23 +00:00
Eike Ziller
e6ecfa0517 Tr: Move some line endings at beginning and end out of tr
Change-Id: Ibb0aba4d6e58bfe4684a818a894876c1f8f7df15
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-10-18 09:33:25 +00:00
Eike Ziller
57a485b9e7 Merge remote-tracking branch 'origin/12.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ib3d0e8b4134105cb3bc159f09192e5fa06508bda
2023-10-17 13:35:45 +02:00
Christian Stenger
2119ef72b0 AutoTest: Fix creating test projects for cmake and qbs
...if the respective kits have no Qt configured.
GTest and Catch2 get fixed with separate patches.

Change-Id: Ib3eb92e97fd683f42e3666bd41728a3824e230ec
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-17 09:06:13 +00:00
Amr Essam
d8bbbd2494 QmlDesigner: Compile effect maker shaders using qsb tool
Task-number: QDS-10811
Change-Id: I6028dea262b2658838b59156ac062657cc4ef3f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-17 08:41:16 +00:00
Christian Stenger
67ad0cf556 AutoTest: Improve Catch2 wizard
Since version 3 of Catch2 it is recommended to use the
approach to link against Catch2 instead of using a single
include.
Make both variants work. There is still a third variant of
using a single include for version 3, which is left out
here, but can easily be fixed for Catch2 users.

Change-Id: I2c25837cb1df4b460b662466dde68563fa7d713c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-17 07:28:47 +00:00
Christian Stenger
bded214791 AutoTest: Improve GTest wizard
It is possible to use the header-only approach as well
as linking against googletest, so make this explicit
inside the wizard and fix the projects for the
respective choice. The old approach could work, but
mostly coincidentally.

Change-Id: I5b1c0b8dfd9a2ffac3268fc4c724ba47c2bf124c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-17 07:28:38 +00:00
hjk
b26e12e199 Debugger: Add a dumper for Utils::Key
Change-Id: I7e586b622160d5b06a3971fec825521231c09522
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-17 07:11:14 +00:00
Eike Ziller
d62f368ceb Tr: Adapt to source string change
Amends 0634f9259b

Change-Id: I4fd8a3e8d7503d14676380a2c0eac958f99814ae
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-10-16 13:19:44 +00:00
Eike Ziller
abeb2287ce Tr: Fix some quoting
Change-Id: I91c515822d48b4efb7c7869c5afe06b5375bf20e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-16 13:16:00 +00:00
Artem Sokolovskii
0634f9259b Tr: Remove full stop in lable names
Fixes: QTCREATORBUG-29355
Change-Id: Ib3769c1c797c0bc500b5b60e2b06b6f8ab7a6fb2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-10-16 12:33:28 +00:00
Eike Ziller
f1fe8392d2 Tr: Fix shortcut display for exiting FakeVim
Qt "Meta" is macOS "Control"

Change-Id: I9c2ca5fe25d70da97871e54060c892eb6fa78e0a
Reviewed-by: hjk <hjk@qt.io>
2023-10-16 10:23:26 +00:00
Eike Ziller
c53c9b539e Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib62e4e8fc7776fa194bceced05612ae5eb113df9
2023-10-13 12:02:38 +02:00
Ali Kianian
e18f0b50e6 QmlDesigner: Rename SingleCollection to CollectionDetails
* SingleCollectionModel is replaced by CollectionDetailsModel
* SingleCollectionView is replaced by CollectionDetailsView

Change-Id: Id3e7572b7b7d7e369684cde21b3cc6a34f819369
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-13 09:21:30 +00:00
Ali Kianian
4cbd05c30d QmlDesigner: Show and edit the property type
Task-number: QDS-10964
Change-Id: I271a17a1bc64eaac8af914a5aa00a7a34317f68b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-12 12:29:48 +00:00
Alessandro Portale
f734ba4461 Wizards: Make editable text options with macros/code non-translatable
Options with contain %{Macros} (sometimes with JavaScript code) should
not be translatable, since a translation can easily a prevent a wizard
from successfully working.

This change turns a couple of trText, trDisabledText and trPlaceholder
options into their non-translatable pendants.

Fixes: QTCREATORBUG-29649
Change-Id: Ia46ab7ac35f78d6368868d78e24179197744921d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-12 09:04:01 +00:00
Eike Ziller
60f7b13059 Merge remote-tracking branch 'origin/12.0'
Change-Id: Ia3e89b8e691e1ca74b03e5a8139647bedf5f88b3
2023-10-12 10:37:25 +02:00
Christian Stenger
c6c0971265 Wizard: Fix kit selection for Qt Quick Application
Fixes: QTCREATORBUG-29698
Change-Id: If0d962352096ebcbf2cdca2b85005add06d85d71
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-12 04:45:27 +00:00
Marco Bubke
cd4cca907b QmlDesigner: Move item library entries to project storage
The subcomponent manager is synchronizing some meta files with the item
library. The project storage is synchronizing types. Synchronizing both
is quite complicated. Moving the the functionality to the project
storage removes that synchronization task.

Task-number: QDS-10266
Change-Id: Icdf14fbe85d5c4891542acae85ebecf0ba77b45d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-11 17:46:23 +00:00
Marcus Tillmanns
f73d288609 Terminal: Fix default colors for dark themes
Certain colors, especially red, were pretty hard to read
with the selected default colors on dark themes.

Change-Id: I9f5a2b5f14113499dbb662e1cbcc2b833952f201
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-10-11 10:58:56 +00:00
Tasuku Suzuki
ef63c39266 Remove QtQuick 1 support from C++ Class wizard
QtQuick 1 is not part of Qt since Qt 5.6

Change-Id: I9fbbafe8a10a81dc6f4833301ecb124d459d5b3b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-10-11 10:33:25 +00:00
Henning Gruendl
ea44631300 QmlDesigner: Adapt spacing to align with the rest
Change-Id: I31e57f144c2aed32b50398790458dc8a6db038ed
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-10-10 15:14:11 +00:00
Henning Gruendl
c54c62e5bd QmlDesigner: Make content library responsive
Task-number: QDS-10769
Change-Id: I5f2b74b11535583c0e7d4ee8408b75d490e88fc2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-10 15:14:01 +00:00
Henning Gruendl
7ffa49f217 QmlDesigner: Make material browser responsive
Change-Id: Ic6b2b9583dc2190974de7c74f8b39e22aa59226d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-10 15:13:51 +00:00
Henning Gruendl
fed8f8c845 QmlDesigner: Fix id mismatch
Change-Id: I4262d2e0efd167dec987fd48574519e0e156c4ff
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-10-10 13:27:49 +00:00
Ali Kianian
c63caa5a39 QmlDesigner: Remove the selected row/column
Task-number: QDS-10948
Change-Id: Iefaa658bef20bed5f8ecb9f7f288871b7d0ee83a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-10 09:05:56 +00:00
Ali Kianian
c12fce7570 QmlDesigner: Add rows to a collection
Task-number: QDS-10619
Change-Id: I37a2b7ebdc3abd8f72a5fe3e7e5fd82e173cd9ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-10 09:05:49 +00:00
Ali Kianian
e3159b3ec4 QmlDesigner: Make collection row selectable
Task-number: QDS-10920
Change-Id: I8d3f34b62b03b0890183c325e89818d578fe449e
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-10-10 09:05:04 +00:00
Amr Essam
93ba99f019 QmlDesigner: Prepare the process to compile shaders externally
Also added customValue for Uniform

Task-number: QDS-10811
Change-Id: Ie47ad41d0c80da149bdab9cae542297d59abcee6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-10 08:39:45 +00:00
Ali Kianian
82be17c2c6 QmlDesigner: Add row id to the collection table
Task-number: QDS-10621
Change-Id: Ib41f7b9a8ce8d19c24b7580887f7c44a7f87fbdc
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-10-10 08:33:45 +00:00
Ali Kianian
8d4e103eac QmlDesigner: Add columns to a collection
Task-number: QDS-10619
Change-Id: Ifa38b2ec8210e7ca7260d3307d3906fd609f3c62
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-10 08:33:30 +00:00
Christian Kandeler
e607c5530e Wizards: Fix "pragma once" check
Obviously, boolean functions return a string that you need to compare to
"true" and "false" explicitly.
Amends 8e75381fce.

Fixes: QTCREATORBUG-29713
Change-Id: I19966555badd67f95f51ea1c1757d8b86e727010
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>
2023-10-09 15:26:08 +00:00
Ali Kianian
d9299272bc QmlDesigner: Make collection column selectable
Task-number: QDS-10895
Change-Id: Ibf047c5d3f38f93a6a58b692974c843467873610
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:45:30 +00:00
Ali Kianian
df8b6310c4 QmlDesigner: Select and delete a column of the collection
Task-number: QDS-10620
Change-Id: Ieba6ab7e4bf366cffad0c020f4d786096150eb0c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:45:15 +00:00
Ali Kianian
6b3a278f13 QmlDesigner: Make the Collection header modifiable
Task-number: QDS-10620
Change-Id: I33c7beaf72decebe93a7e4d64d0ca6d6b3590af6
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-09 10:20:54 +00:00
Thomas Hartmann
7f2b721dbf QmlDesigner: Fix id in StackView template
Task-number: QDS-10749
Change-Id: Ic611297f9da64461351a4f29374fdac3709494d2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Peter Rohles <peter.rohles@qt.io>
2023-10-06 16:08:26 +00:00
Thomas Hartmann
793323cc16 QmlDesigner: Add .qad filter to project template
Task-number: QDS-10815
Change-Id: I5a83e27197f33b39469bcfe5d5d94cccca79d14e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-10-06 09:53:41 +00:00
Tim Jenssen
85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
2023-10-05 15:53:42 +02:00
Amr Essam
84bbfec651 QmlDesginer: Add functionality effect preview
Also some refactoring and fixes to the model

Task-number: QDS-10811
Change-Id: If27b2e8e9bac4d46200ed37bf0aec8255ee19022
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-10-03 08:14:58 +00:00