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/imports | |
| parent | b684ba219493fb7b0108ae367d6d033aaa28053b (diff) | |
Post-merge fixes
Change-Id: I2350df5368ee34d6c7072d456806e518ce533839
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/models/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/imports/particles/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/imports/window/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/imports/workerscript/CMakeLists.txt | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 8594c08408..90abdaa743 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(modelsplugin - TARGET_PATH "QtQml/Models.2" URI "QtQml.Models" VERSION "2.15" DESIGNER_SUPPORTED @@ -24,4 +23,4 @@ qt_add_qml_module(modelsplugin #### Keys ignored in scope 1:.:.:models.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "2.15" -# TARGETPATH = "QtQml/Models.2" +# TARGETPATH = "QtQml/Models" diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 482fe56c52..d20d5eecba 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(particlesplugin - TARGET_PATH "QtQuick/Particles.2" URI "QtQuick.Particles" VERSION "2.15" CLASSNAME QtQuick2ParticlesPlugin @@ -27,4 +26,4 @@ qt_add_qml_module(particlesplugin #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "2.15" -# TARGETPATH = "QtQuick/Particles.2" +# TARGETPATH = "QtQuick/Particles" diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 80b286091d..2973edb02f 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(qtquick2plugin - TARGET_PATH "QtQuick.2" URI "QtQuick" VERSION "2.15" DESIGNER_SUPPORTED @@ -30,7 +29,7 @@ qt_add_qml_module(qtquick2plugin #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "2.15" -# TARGETPATH = "QtQuick.2" +# TARGETPATH = "QtQuick" ## Scopes: ##################################################################### diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 8e27eca14c..17e0496b2c 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(windowplugin - TARGET_PATH "QtQuick/Window.2" URI "QtQuick.Window" VERSION "2.15" DESIGNER_SUPPORTED @@ -27,4 +26,4 @@ qt_add_qml_module(windowplugin #### Keys ignored in scope 1:.:.:window.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "2.15" -# TARGETPATH = "QtQuick/Window.2" +# TARGETPATH = "QtQuick/Window" diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index 8e82b70346..b711cf4593 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(workerscriptplugin - TARGET_PATH "QtQml/WorkerScript.2" URI "QtQml.WorkerScript" VERSION "2.15" DESIGNER_SUPPORTED @@ -24,4 +23,4 @@ qt_add_qml_module(workerscriptplugin #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "2.15" -# TARGETPATH = "QtQml/WorkerScript.2" +# TARGETPATH = "QtQml/WorkerScript" |