Commit Graph

20 Commits

Author SHA1 Message Date
Thomas Hartmann
41daf979c5 QmlDesigner: Rename Generate QRC Resource File -> Generate Deployable Package
This is a simpler less technical name and we plan to introduce
the design viewer officially in the near future.

Change-Id: I1e9491000f6618f8f04fa307116cd865ec6b04be
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-04-14 08:42:31 +00:00
Thomas Hartmann
ee8c4b27e4 QmlDesigner: Add the .qmlproject file to the .qmlrc files
Instead not adding .qtds, .db-shm, .db-wal.

Task-number: QDS-6394
Change-Id: Ie3089a707bd7d29bdbf5795c676ff38e09f59e41
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-31 10:24:53 +00:00
hjk
25f5771aa4 Rename QtSupport::BaseQtVersion to QtVersion
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-24 12:13:19 +00:00
Tapani Mattila
c57573708a Move qrc, rcc and CMakeLists.txt generating menu option to file menu
Task-number: QDS-5903
Change-Id: I42cba21eaecaf5580c40dab8ce32bbf12c37f13f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-18 10:32:25 +00:00
hjk
1167f0fac7 Core: FilePath-ify DocumentManager
And adjust users.

Change-Id: I10ca9aeb442a07f7c8d42af362b294aa3398f5c1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-22 09:10:29 +00:00
Thomas Hartmann
a58686cf96 QmlDesigner: Improve .qrc file generation
* Filter for more suffixes and avoid code duplication.
* Always use the project path for file dialogs.
* Allow choosing (existing?) .qrc file.

It is now possible to 'append' to and manage an existing .qrc file.

Change-Id: Ib66751adc49839fd3fae7ac3ee3ae5fa741b7d50
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-16 13:11:54 +00:00
Tim Jenssen
22121885fe baseqtversion: commands are FilePathes
also renamed the qmlscene* qmlRuntime*

Change-Id: Ifd522e21f5ce30aaa54060fdcebee2cd8b9463c4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-14 09:50:01 +00:00
hjk
6f5d78a297 QtSupport: Use FilePath for several BaseQtVersion members
uicCommand(), designerCommand(), linguistCommand(), qscxmlcCommand(),
qmlsceneCommand(), qmlplugindumpCommand().

No change in functionality intented.

Change-Id: I43121de559019f96c2c1ff3b423974dddfc37124
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-01 09:30:29 +00:00
Pekka Kaikkonen
68ff37e630 QmlDesigner : QRC File integration
Split resource file generation into two actions. Take file from
current project into account. .qrc generation should take existing
.qrc file into account.

Task-number: QDS-4516
Task-number: QDS-4517
Task-number: QDS-4519
Change-Id: Iee15880657e456fbd74df505c10ee83a80ee64a7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-25 15:17:26 +00:00
Thomas Hartmann
fc85c52b99 QmlDesigner: Allow removing files from generate resource
User can remove unwanted files when he/she is generating the .qmlrc
resource file using Generate Resource option from the build menu. User can
uncheck the files from the file list in the appeared table widget. Also
unnecessary git-files and temporary files are filtered out.

Task-number: QDS-4430
Change-Id: I45fa0f42bf3a1f7fc7583a9ce29c324c8e7cf9cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-06-11 06:25:52 +00:00
hjk
779e572ea3 QmlDesigner: Replace SynchronousProcess use in BuildableHelperLibrary
Change-Id: I064d0c53116b1f657c1b1d301b4de3e337ba9eaa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-03 13:33:49 +00:00
Kai Köhne
c5ecb47c61 QmlDesigner: Retrieve rcc command centrally
Change-Id: I6886a22b51a002b48c248b3f49adc622c58c7ad8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 14:17:15 +00:00
Eike Ziller
37a0ef29c0 QML: Use new message manager API
That is more evocative. Also avoid some instances of popping up the
general messages pane, which should preferably only happen on direct
user interaction.

Task-number: QTCREATORBUG-24430
Change-Id: I69bb49f84c1486fd32b2a048ca4d76dceb6a0b2b
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-22 08:09:10 +00:00
Alessandro Portale
625a35e492 QmlDesigner: performance-for-range-copy
Avoid copying the loop variable on each iteration if a const reference
would suffice.

For QPointers<>, this change only adds a const.

Change-Id: I5abe7d793cd46859a9a4f9304ec1bd41f899d72c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-14 20:10:01 +00:00
Leena Miettinen
1f26c6d1b9 Qt Quick Designer: Fix UI text punctuation and capitalization
According to the guidelines in
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Id1f484855396c16d629b5743bef9710e84ba2cd6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-11 08:38:21 +00:00
Alessandro Portale
c6a7aed17e QmlDesigner: Make "Generate resources" action translatable
As a first step towards enabling the creation of .qmlrc packages in Qt
Creator, make it translatable (before Qt Creator 4.12 string freeze).

Task-number: QDS-1286
Change-Id: I3fd296c3a9c8ec7fc985b61893b1a7e7037328d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-01-23 16:22:38 +00:00
Alessandro Portale
9c43466485 Use HostOsInfo::withExecutableSuffix instead of if/else
Let's use our Utils.

Change-Id: I8cfbce55d2b41e42e86d050433df2cfd20cebe1b
Reviewed-by: hjk <hjk@qt.io>
2019-11-14 15:17:34 +00:00
Tobias Hunger
b489bfd615 BaseQtVersion: remove qmakeProperty(...) getter
Qt 6 will not use qmake to identify a Qt version, so this can not
be part of the public interface of BaseQtVersion anymore.

Provide getters for the information actually read via qmakeProperty(...).

Use the getters whenever possible.

Change-Id: Iadbee80b75e4f8b06caf90e7ed69fae2029b4dd7
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 11:46:43 +00:00
Tim Jenssen
a34d84fa4d QmlDesigner: small file path fixes
- add missing path separator
- add missing bracket add save file name dialog file filter

Change-Id: I45b1893f4d10cf5b030883a4dcd73d97a4a863b2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-09-02 09:51:42 +00:00
Tim Jenssen
b77bce63e3 QmlDesigner: add a generate resource menu entry
The result can be used with the Webassembly qmlprojector.

Change-Id: I69ed21561c05fcbb9552bf74217e3546c489d4a6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-29 14:40:23 +00:00