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 | |
parent | b684ba219493fb7b0108ae367d6d033aaa28053b (diff) |
Post-merge fixes
Change-Id: I2350df5368ee34d6c7072d456806e518ce533839
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-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 | ||||
-rw-r--r-- | src/particles/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/qml/.prev_CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/qml/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/qmlmodels/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/quick/CMakeLists.txt | 13 |
12 files changed, 24 insertions, 22 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" diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 1a82389d2f..f6deceb5ae 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -102,7 +102,7 @@ qt_add_resource(QuickParticles "particles1" # IMPORT_VERSION = "2.15" # MODULE = "quickparticles" # QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles.2" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick/Particles" # QML_IMPORT_NAME = "QtQuick.Particles" ## Scopes: @@ -134,7 +134,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.2" + QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles" ) qt6_qml_type_registration(QuickParticles) diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 21fc09bfee..fdb59c1ea4 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -76,6 +76,7 @@ qt_add_module(Qml debugger/qqmldebugserviceinterfaces_p.h debugger/qqmldebugstatesdelegate_p.h debugger/qqmlprofiler_p.h + inlinecomponentutils_p.h jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 95eabdcf7f..b61850f610 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -76,6 +76,7 @@ qt_add_module(Qml debugger/qqmldebugserviceinterfaces_p.h debugger/qqmldebugstatesdelegate_p.h debugger/qqmlprofiler_p.h + inlinecomponentutils_p.h jsapi/qjsengine.cpp jsapi/qjsengine.h jsapi/qjsengine_p.h jsapi/qjsvalue.cpp jsapi/qjsvalue.h jsapi/qjsvalue_p.h jsapi/qjsvalueiterator.cpp jsapi/qjsvalueiterator.h jsapi/qjsvalueiterator_p.h diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index ca8dcadebc..7247812a29 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -25,7 +25,7 @@ qt_add_module(QmlModels #### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: # IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models.2" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/Models" # QML_IMPORT_NAME = "QtQml.Models" ## Scopes: @@ -69,7 +69,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.2" + QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models" ) qt6_qml_type_registration(QmlModels) 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) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 23324a4307..e1e8669886 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -350,7 +350,7 @@ endif() #### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: # IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick.2" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick" # QML_IMPORT_NAME = "QtQuick" ## Scopes: @@ -361,12 +361,17 @@ qt_extend_target(Quick CONDITION QT_FEATURE_qml_network Qt::Network ) +qt_extend_target(Quick CONDITION QT_FEATURE_opengl + LIBRARIES + Qt::OpenGLPrivate +) + qt_extend_target(Quick CONDITION MSVC DEFINES _CRT_SECURE_NO_WARNINGS ) -#### Keys ignored in scope 4:.:.:quick.pro:solaris-cc_x_: +#### Keys ignored in scope 5:.:.:quick.pro:solaris-cc_x_: # QMAKE_CXXFLAGS_RELEASE = "--O2" qt_extend_target(Quick CONDITION WIN32 AND NOT WINRT @@ -568,7 +573,7 @@ qt_extend_target(Quick CONDITION QT_FEATURE_opengl AND QT_FEATURE_quick_shaderef items/qquickopenglshadereffectnode.cpp items/qquickopenglshadereffectnode_p.h ) -#### Keys ignored in scope 40:.:items:items/items.pri:QT_FEATURE_opengl: +#### Keys ignored in scope 41:.:items:items/items.pri:QT_FEATURE_opengl: # OTHER_FILES = "$$PWD/shaders/shadereffect.vert" "$$PWD/shaders/shadereffect.frag" "$$PWD/shaders/shadereffectfallback.vert" "$$PWD/shaders/shadereffectfallback.frag" "$$PWD/shaders/shadereffect_core.vert" "$$PWD/shaders/shadereffect_core.frag" "$$PWD/shaders/shadereffectfallback_core.vert" "$$PWD/shaders/shadereffectfallback_core.frag" qt_extend_target(Quick CONDITION QT_FEATURE_quick_canvas @@ -598,7 +603,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.2" + QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick" ) qt6_qml_type_registration(Quick) |