diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/folderlistmodel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/labsanimation/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/labsmodels/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/layouts/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/localstorage/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/models/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/particles/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/qtqml/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/qtqml/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/settings/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/shapes/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/sharedimage/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/statemachine/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/testlib/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/testlib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/window/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/imports/workerscript/CMakeLists.txt | 4 |
20 files changed, 40 insertions, 38 deletions
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt index 64dce0170b..020f683e41 100644 --- a/src/imports/CMakeLists.txt +++ b/src/imports/CMakeLists.txt @@ -24,6 +24,8 @@ if(TARGET Qt::Quick) add_subdirectory(layouts) add_subdirectory(qtquick2) add_subdirectory(window) +endif() +if(QT_FEATURE_quick_shadereffect AND TARGET Qt::Quick) add_subdirectory(wavefrontmesh) endif() if(TARGET Qt::Quick AND TARGET Qt::Test) diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index cc2249c5d0..0bc9f28da6 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlfolderlistmodelplugin URI "Qt.labs.folderlistmodel" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlFolderListModelPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -22,5 +22,5 @@ qt_add_qml_module(qmlfolderlistmodelplugin #### Keys ignored in scope 1:.:.:folderlistmodel.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/folderlistmodel" diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index a8830231da..a4de38267e 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(labsanimationplugin URI "Qt.labs.animation" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtLabsAnimationPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -20,5 +20,5 @@ qt_add_qml_module(labsanimationplugin #### Keys ignored in scope 1:.:.:labsanimation.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/animation" diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 358bd5df18..efd3339e2f 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(labsmodelsplugin URI "Qt.labs.qmlmodels" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQmlLabsModelsPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -19,7 +19,7 @@ qt_add_qml_module(labsmodelsplugin #### Keys ignored in scope 1:.:.:labsmodels.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/qmlmodels" ## Scopes: diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index f788bd3f5a..ffde82d340 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qquicklayoutsplugin URI "QtQuick.Layouts" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuickLayoutsPlugin SKIP_TYPE_REGISTRATION @@ -29,5 +29,5 @@ qt_add_qml_module(qquicklayoutsplugin #### Keys ignored in scope 1:.:.:layouts.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Layouts" diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 4727de7f93..d3fd8ff290 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmllocalstorageplugin URI "QtQuick.LocalStorage" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QQmlLocalStoragePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -21,6 +21,6 @@ qt_add_qml_module(qmllocalstorageplugin #### Keys ignored in scope 1:.:.:localstorage.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" # OTHER_FILES = "localstorage.json" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/LocalStorage" diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 0efe8eb479..a6d4065202 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(modelsplugin URI "QtQml.Models" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin SKIP_TYPE_REGISTRATION @@ -19,5 +19,5 @@ qt_add_qml_module(modelsplugin #### Keys ignored in scope 1:.:.:models.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/Models" diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 8326575cdc..6d5e71f7d1 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(particlesplugin URI "QtQuick.Particles" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuick2ParticlesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -21,5 +21,5 @@ qt_add_qml_module(particlesplugin #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Particles" diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index 7db224aa44..4e17431218 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_add_qml_module(qmlplugin URI "QtQml" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -31,7 +31,7 @@ qt_add_qml_module(qmlplugin #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: # CXX_MODULE = "qml" # DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 705d4c965b..f50f2f69f5 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_add_qml_module(qmlplugin URI "QtQml" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION @@ -32,7 +32,7 @@ qt_add_qml_module(qmlplugin #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: # CXX_MODULE = "qml" # DYNAMIC_QMLDIR = "module QtQml" "plugin qmlplugin" "classname QtQmlPlugin" "typeinfo plugins.qmltypes" "designersupported" "import QtQml.Models" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml" ## Scopes: diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 6b017885ae..e007c476f8 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qtquick2plugin URI "QtQuick" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION @@ -24,7 +24,7 @@ qt_add_qml_module(qtquick2plugin #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick" ## Scopes: diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index c9b570fbf8..0243e2cf8f 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlsettingsplugin URI "Qt.labs.settings" - VERSION "1.1" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlSettingsPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -20,5 +20,5 @@ qt_add_qml_module(qmlsettingsplugin #### Keys ignored in scope 1:.:.:settings.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.1" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/settings" diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index c745ccd038..92ad133fd8 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlshapesplugin URI "QtQuick.Shapes" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlShapesPlugin SKIP_TYPE_REGISTRATION SOURCES @@ -21,5 +21,5 @@ qt_add_qml_module(qmlshapesplugin #### Keys ignored in scope 1:.:.:shapes.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Shapes" diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index b6d61cf1e5..c840fda85f 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(sharedimageplugin URI "Qt.labs.sharedimage" - VERSION "1.0" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickSharedImagePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -25,5 +25,5 @@ qt_add_qml_module(sharedimageplugin #### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.0" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/sharedimage" diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index 4e4b73cc7d..232f3f28d5 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qtqmlstatemachine URI "QtQml.StateMachine" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQmlStateMachinePlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -26,5 +26,5 @@ qt_add_qml_module(qtqmlstatemachine #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/StateMachine" diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 43c30c7f39..b7a6ff468a 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 @@ -29,9 +29,9 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtTest" set(qml_files diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 18f1751d61..03801d76eb 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 @@ -29,9 +29,9 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtTest" set(qml_files diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index be083aede5..3790b7d53e 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(qmlwavefrontmeshplugin URI "Qt.labs.wavefrontmesh" - VERSION "1.15" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QmlWavefrontMeshPlugin SKIP_TYPE_REGISTRATION GENERATE_QMLTYPES @@ -21,5 +21,5 @@ qt_add_qml_module(qmlwavefrontmeshplugin #### Keys ignored in scope 1:.:.:wavefrontmesh.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "Qt/labs/wavefrontmesh" diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index c300126bac..99cedf333c 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(windowplugin URI "QtQuick.Window" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2WindowPlugin SKIP_TYPE_REGISTRATION @@ -22,5 +22,5 @@ qt_add_qml_module(windowplugin #### Keys ignored in scope 1:.:.:window.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQuick/Window" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index ac2b0fda7e..57b2739a10 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_qml_module(workerscriptplugin URI "QtQml.WorkerScript" - VERSION "2.15" + VERSION "${CMAKE_PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin SKIP_TYPE_REGISTRATION @@ -19,5 +19,5 @@ qt_add_qml_module(workerscriptplugin #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "2.15" +# QML_IMPORT_VERSION = "$$QT_VERSION" # TARGETPATH = "QtQml/WorkerScript" |