Commit Graph

1235 Commits

Author SHA1 Message Date
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
Tim Jenssen
97ca8cc270 Core: add ICore::isQtDesignStudio()
Change-Id: I3aed97b62abd05b283ac327be210af75f173383d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-10-04 14:39:39 +00:00
hjk
342e066886 Utils, all: Standardize on QtcSettings
Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-27 13:25:31 +00:00
Tim Jenssen
8e0e097f55 QmlProjectManager: use qmlpuppet as qmlRunCommand only at host
Change-Id: I7a8e33bdf1007f26e45514abde378ca9b6799c81
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-09-25 18:34:27 +00:00
Burak Hancerli
794cb89c2a QmlProject: Fix skipping some nodes with QDS prefix
This patch also contains the test data and updated test code for the
converters to test QDS prefixed version of .qmlproject file.

Task-number: QDS-10503
Change-Id: I496ba6f3d4d3cf90e75c2959c4196f4607677ea1
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-09-25 12:35:49 +00:00
Thomas Hartmann
205af45177 QmlProject: Fix issues with cmakefiles.txt generation
If file names contain spaces we simply add quotes around the filename.
If file names contain special characters (!, % & etc), then we give a warning and skip the file to not break the build.

Task-number: QDS-10745
Change-Id: Iae9497725816769a8922a0ef38f0dc05fb1bb582
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-22 11:49:28 +00:00
Thomas Hartmann
0ef6c184c1 QmlProject: Add new options to cmakefiles.txt template
If the template was regernated (which is not the default), it
was missing features.

Change-Id: I446dd454127795e0e7edcb6669dc7025ce37be01
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-19 12:26:30 +00:00
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
hjk
8d0aa34bfc Plugins: A bit more Keys and Store
Change-Id: Iee55eeaa881dd9f2047fdbe95ad8d827f4ba34e0
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-25 08:00:02 +00:00
Burak Hancerli
c71ebda677 QmlProject: Fix incorrect conversion of MCU property
Task-number: QDS-10376
Change-Id: Ic16d03355419281a0bf5c8bd04ba5fea317a70d4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-24 15:43:23 +00:00
hjk
6e307be365 Utils: Rename the new Storage to Store
Apparently that's what the young people on the web use for such a thing.

Change-Id: I75d5396ff3cb3c26efd6008b5f2261354c4f7896
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-24 05:56:57 +00:00
hjk
dc6b40a5c0 Use Utils::Storage instead of QVariantMap in a few places
Change-Id: I02833cf2bc3caaadc22ff93ae530e4aebe4c3868
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-23 14:30:50 +00:00
Tim Jenßen
0f05d7adb3 cleanup QMessageBox includes
Change-Id: I358a216c48b8fbf549af38360a93a073f03e3a98
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-22 16:56:50 +00:00
Jarek Kobus
121d73b30f Utils: Rename ProjectExplorer::Runnable into Utils::ProcessRunData
Move it into Utils lib.

Change-Id: I3b6c16d18439cabddf59afc03116f13c1970102c
Reviewed-by: hjk <hjk@qt.io>
2023-08-17 07:44:34 +00:00
hjk
aa25fdcc69 QtSupport: Rename qtkitinformation.{h,cpp} -> qtkitaspect.{h,cpp}
Change-Id: I12229e5e98b468101d32edd35be74bbda0921d89
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-08-15 08:59:52 +00:00
hjk
017d7c0e47 ProjectExplorer: Rename kitinformation.{h,cpp} to kitaspects.{h,cpp}
Change-Id: I069bddeb457366210d339edcbb8ffb359a40fab8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-08-15 07:31:03 +00:00
Burak Hancerli
e7fa015a4c QmlProjectManager: Fix for absolute import path problem
Task-number: QDS-10145
Change-Id: I11998b474a25351901ca0eb45716e1d3e309c572
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-08-09 14:43:16 +00:00
Burak Hancerli
eb13b7274d QmlProjectManager: Fix a crash while accessing an uninitialized aspect
Task-number: QDS-8145
Change-Id: I1ee9688a2ae860291878c64305cb5e6b2e0df277
Reviewed-by: hjk <hjk@qt.io>
2023-08-08 16:07:43 +00:00
Jarek Kobus
c6587de684 QmlProjectManager: Get rid of foreach
Change-Id: Iab2933ac8cf06c81d667ab94a26b86241a3a0c24
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-08 10:03:17 +00:00
Aleksei German
d1623c38c6 QmlDesigner: Remove Update QmlProject File action
- removes the action from the file menu
- adds tr::tr to the menu string
- fixes an if condition
- adds some comments on how we can improve it

Change-Id: I5f816a8dc9245bec5aa0db13318b702414ad6bcd
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-31 12:39:37 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
hjk
6d5b078238 QmlProjectManager: Use aspects more directly
Change-Id: Ibfa91c541666ed81dbe5238075cafebd628f5889
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-17 06:04:57 +00:00
hjk
c2b5a75d76 QmlProjectManager: Prepare special aspects for auto-registration
Change-Id: I9b5e019dfeaf394107a190e78e8880b4f16b9ee9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-14 05:06:37 +00:00
hjk
135a7682f5 ProjectExplorer: Make more aspects directly usable in AspectContainers
Change-Id: I6634c27c8d516411ad84e6cb7c361262ead53124
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 05:23:04 +00:00
hjk
739f835ef1 ProjectExplorer: Remove unusual {Arguments,WorkingDir}Aspect
Follows suite to 2cc4967 to have the user side code more uniform.
Most of the extra verbosity (setMacroExpander) can go away again
when distributing the expander via the "owning" AspectContainer.

Change-Id: I9e80cb235f0a4a9ebee601dd638aefbaa41efc1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-05 12:55:31 +00:00
Tim Jenssen
d9910058a3 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
2023-07-04 20:36:03 +02:00
Tim Jenssen
48230d63b8 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
 src/plugins/qmldesigner/CMakeLists.txt
 src/plugins/qmldesignerbase/CMakeLists.txt
 src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
2023-07-04 16:22:32 +00:00
Eike Ziller
a490625394 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ie4b1f249d1a5b7835022f367ee6b1c8a3c953f0b
2023-07-04 12:57:47 +02:00
Marcus Tillmanns
57ff63bb96 Device: Don't cache qmlRunCommand
Caching makes the settings page less snappy.

Also fixed searching for qml runtime if not set in
QmlProjectRunConfiguration

Fixes: QTCREATORBUG-29341
Change-Id: Ia3ce72f3e3b857a857f706694794304dcbf1793c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-03 12:25:40 +00:00
Aleksei German
cfadc5a984 QmlDesigner: Add context object to a connection
Change-Id: I3662737acf3d80c17c8004594540220296971ef3
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-27 15:56:43 +00:00
Aleksei German
cbe6d53fa7 QmlDesigner: Fix multi-arg warning
Change-Id: Ic88706b92001a60d56f901684d7a08dab9f26c3d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-27 15:56:28 +00:00
Aleksei German
d7a60e4118 QmlDesigner: Improve main qmlFile fallback logic
Change-Id: Ie08373478518e17c9c0525b945ff5397eeb824a0
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-27 15:56:20 +00:00
Eike Ziller
3e65778d66 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8be5a00000a6699346ed1c44c0711d1f017462a7
2023-06-27 15:20:18 +02:00
Eike Ziller
d1649b060b QmlDesigner: Disable warnings-as-errors by default
for everyone that doesn't explicitly set the BUILD_DESIGNSTUDIO CMake
variable or the corresponding environment variable or CMake option.

Fixes: QTCREATORBUG-29238
Change-Id: Ie1959a468fc7bee0fed790b025ecdb3f49ab8f08
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-27 12:33:15 +00:00
Marco Bubke
94a704bb87 QmlDesigner: Only enable error on warnings as you compile with tests or in debug
There is no advantage for an enduser to get errors on warnings because
he cannot do much about it. It is still nudging the developers to fix
the warnings.

Task-number: QTCREATORBUG-29238
Change-Id: If9f73f2766d686b119cd264ee7b3c3c9afa2c70d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit ff2a14917f)
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 12:32:56 +00:00
hjk
691c8148a3 ProjectExplorer/RemoteLinux: Consolidate X11ForwardingAspect handling
Change-Id: I7e74f58ab50c84c74ba65f9f64aaa4d0ea73bbb6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-26 10:48:08 +00:00
Aleksei German
fcab6a10d2 QmlDesigner: Improve project open functions
This patch:
unifies lookup for the first qml file to open;
increases number of possible fallback options;
adds missing implementations to some methods in QmlBuildSystem.

Task-number: QDS-9984
Change-Id: Ib282b1fca8b0564fe80f00e3d9ffe82c1a15c540
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 09:47:57 +00:00
Aleksei German
96cd0b3668 QmlDesigner: Fix for mainFiles missing filepath
It always returns projectDirectory otherwise

Task-number: QDS-9984
Change-Id: Ia8a7d660eef46ec4e0afd53c1452798f95367dcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 09:47:52 +00:00
hjk
bf46b4d557 QmlProjectManager: Compile fix after Qt source compatibility break
error: operands to '?:' have different types 'QStringBuilder<const QString&, QString>' and 'QStringBuilder<QString, QString>'

Caused by af8f9a2a6e3dbc8.

Change-Id: Ib3dfca2cb5f1cb1855f25d178f63898eb6745c46
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 07:46:24 +00:00
Tim Jenssen
846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
2023-06-22 14:50:56 +00:00
hjk
67ec9bbce0 QmlProjectManager: Compile fix after Qt source compatibility break
error: operands to '?:' have different types 'QStringBuilder<const QString&, QString>' and 'QStringBuilder<QString, QString>'

Caused by af8f9a2a6e3dbc8.

Change-Id: Ia3dfca2cb5f1cb1855f25d178f63898eb6745c46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 11:28:15 +00:00
Knud Dollereder
9021558bcc Fix policy warnings in project templates
When compiling default created projects with Qt 6.5 and cmake
warnings about Qt policy QTP0001 where issued. This is now
fixed for the project templates. A second patch for the
qtquick-components repo will be provided to get rid of the
remaining policy warnings

Change-Id: Ia701a0cc7e030c9cb1459dc48e5ed2a91a6c6c0e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-06-20 13:44:08 +00:00
Tim Jenssen
053e970c4d QmlProjectManager: use qml2puppet only if it is QtSudio Qt
Task-number: QTCREATORBUG-29259
Change-Id: Ib05737368c224fa28b2c9f091dfa0e210bc838af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-15 12:45:36 +00:00
Alessandro Portale
50c386b53a Translations: Call Tr::tr() where it should
Change-Id: Ibf2be8a9aabd0a4e8e763a96901feaaa6eda2f3e
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 12:04:26 +00:00
Tim Jenssen
66263782ec Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
  src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
  src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
  src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I4c8a33736b25c3bb24241224d0a1e7358bb7fd94
2023-06-08 16:35:56 +02:00
Tim Jenssen
f09598de43 QmlProjectManager: fix import FilePath
Deployment was not working for subdirectories.
Path was not correct in projectInfo.importPaths.maybeInsert.

Change-Id: I4fd8a08ef6182c52963d6d76a700f4687abd9730
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-07 18:03:05 +00:00
Marco Bubke
ff2a14917f QmlDesigner: Only enable error on warnings as you compile with tests or in debug
There is no advantage for an enduser to get errors on warnings because
he cannot do much about it. It is still nudging the developers to fix
the warnings.

Task-number: QTCREATORBUG-29238
Change-Id: If9f73f2766d686b119cd264ee7b3c3c9afa2c70d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-07 11:32:02 +00:00
Tim Jenssen
a6d1b594a4 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I79a272471b3400eec0a0fa9fca175d1d4a8c0a13
2023-06-07 12:07:21 +02:00
Tim Jenssen
adc901ba2c QmlProjectManager: fix warning when project has no mainScript
happens at start when project is still parsing

Change-Id: I02b1d52b41c4f092fb4f45cf3dcf192e29eda324
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-07 09:50:15 +00:00
Tim Jenssen
2b4fe0aef8 Qml: fix Boot2Qt deployment from Windows host
- fix QmlBuildSystem::target*() to resolve maybe device files
 - Cache lookup of qml path on device

Task-number: QDS-9994
Change-Id: I5675368368f2d1cc513feb98fdcdd75fda1a764a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-07 09:49:30 +00:00