diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-12 12:59:24 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-12 17:30:34 +0000 |
| commit | 1d4fa26a706a97c0c76a7de5cf6c98bb345dfbd7 (patch) | |
| tree | 71e6a822db3536758c97e2df3bd5fb0ce40e3d1e /src | |
| parent | 3e0edc61cf4d2e0a613ed971f42a96120b094ecc (diff) | |
Regenerate qtdeclarative
Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/particles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmlmodels/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quickshapes/CMakeLists.txt | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 37d5970971..36f492b4a5 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(QuickParticles PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQuick.Particles - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" ) qt6_qml_type_registration(QuickParticles) diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index a19926ab23..504d26e03d 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -613,7 +613,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) qt6_qml_type_registration(Qml) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 765b038acb..4d20ee1081 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -620,7 +620,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) qt6_qml_type_registration(Qml) diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 9fe275077b..a96f115ac2 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -72,7 +72,7 @@ set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.Models - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" ) qt6_qml_type_registration(QmlModels) diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0599001034..0b48e41a13 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -108,7 +108,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" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 6d3a87ab10..d5e83794e5 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -108,7 +108,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" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index c7c839fb49..aa08c89170 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -612,7 +612,7 @@ set_target_properties(Quick PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQuick - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" ) qt6_qml_type_registration(Quick) diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index fae5b4dc88..641875e6d0 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -74,7 +74,7 @@ set_target_properties(QuickShapes PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.15 QT_QML_MODULE_URI QtQuick.Shapes - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Shapes" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" ) qt6_qml_type_registration(QuickShapes) |