diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-07-12 10:38:13 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-07-13 15:38:46 +0000 |
| commit | 453f4996db44c80c8dfdf9a3f07781f381226efa (patch) | |
| tree | 7baa618a6d1fd04e87d55cc9a642d87b0085468c /src/share | |
| parent | 0420caa3ceebd32221d15f1c81b44b3033ae4391 (diff) | |
use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.
This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.
Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/qtcreator/data.pro | 3 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/share/qtcreator/externaltools/qml.xml (renamed from src/share/qtcreator/externaltools/qmlviewer.xml) | 10 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/share/qtcreator/data.pro b/src/share/qtcreator/data.pro index fc96289f3a..cd973905e9 100644 --- a/src/share/qtcreator/data.pro +++ b/src/share/qtcreator/data.pro @@ -9,8 +9,7 @@ STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH STATIC_FILES = \ $$PWD/externaltools/lrelease.xml \ $$PWD/externaltools/lupdate.xml \ - $$PWD/externaltools/qmlviewer.xml \ - $$PWD/externaltools/qmlscene.xml + $$PWD/externaltools/qml.xml unix { osx:STATIC_FILES += $$PWD/externaltools/vi_mac.xml else:STATIC_FILES += $$PWD/externaltools/vi.xml diff --git a/src/share/qtcreator/externaltools/CMakeLists.txt b/src/share/qtcreator/externaltools/CMakeLists.txt index dcd107ef35..5059fdcb00 100644 --- a/src/share/qtcreator/externaltools/CMakeLists.txt +++ b/src/share/qtcreator/externaltools/CMakeLists.txt @@ -1,6 +1,6 @@ set(EXT_TOOLS_DIR "${IDE_DATA_PATH}/externaltools") -set(tools lrelease.xml lupdate.xml qmlscene.xml qmlviewer.xml) +set(tools lrelease.xml lupdate.xml qmlscene.xml qml.xml) if (WIN32) list(APPEND tools notepad_win.xml) diff --git a/src/share/qtcreator/externaltools/qmlviewer.xml b/src/share/qtcreator/externaltools/qml.xml index 32a362d6b8..cffaf93ed7 100644 --- a/src/share/qtcreator/externaltools/qmlviewer.xml +++ b/src/share/qtcreator/externaltools/qml.xml @@ -26,14 +26,14 @@ ****************************************************************************/ --> -<externaltool id="qmlviewer"> - <description>Runs the current QML file with qmlviewer</description> - <displayname>Qt Quick 1 Preview (qmlviewer)</displayname> +<externaltool id="qml"> + <description>Runs the current QML file with QML utility.</description> + <displayname>QML utility</displayname> <category>Qt Quick</category> <order>1</order> <executable> - <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/qmlviewer</path> - <path>qmlviewer</path> + <path>%{CurrentProject:QT_INSTALL_BINS}/qml</path> + <path>qml</path> <arguments>%{CurrentDocument:FilePath}</arguments> <workingdirectory>%{CurrentDocument:Path}</workingdirectory> <environment>QT_LOGGING_TO_CONSOLE%3D1</environment> |