diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-28 23:41:18 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-30 20:45:49 +0000 |
| commit | b134476cdb123d20521de664d6dea0550fd6876b (patch) | |
| tree | d297637e9a76cd7bf0eff507d47b6925fd424d57 /src/qmlworkerscript | |
| parent | b684ba219493fb7b0108ae367d6d033aaa28053b (diff) | |
Post-merge fixes
Change-Id: I2350df5368ee34d6c7072d456806e518ce533839
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0a27479d36..22fc4e4709 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -48,7 +48,7 @@ qt_add_module(QmlWorkerScript #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: # IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" ## Scopes: @@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.WorkerScript - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2" + QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 1ecc6d03f7..c7f7b60c7d 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -48,7 +48,7 @@ qt_add_module(QmlWorkerScript #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: # IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript.2" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" ## Scopes: @@ -105,7 +105,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.WorkerScript - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript.2" + QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) |