diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:02:23 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:50:14 +0000 |
commit | f0d23d3ff9da26a71295a6abd356c8d366d17439 (patch) | |
tree | c68f990a0fda40a16c484ffb6403c165c44a73ba /src/plugins | |
parent | 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 (diff) |
Regenerate qtdeclarative before merge
Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins')
16 files changed, 11 insertions, 30 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 805cddf62d..5e24a32791 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,10 +1,8 @@ # Generated from plugins.pro. - -if(QT_FEATURE_thread AND QT_FEATURE_qml_debug) +if(QT_FEATURE_qml_debug AND QT_FEATURE_thread) add_subdirectory(qmltooling) endif() - if(TARGET Qt::Quick) add_subdirectory(scenegraph) endif() diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt index 16b70c455e..6e19d288a8 100644 --- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt +++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt @@ -18,5 +18,4 @@ add_qt_module(PacketProtocol ) #### Keys ignored in scope 1:.:.:packetprotocol.pro:<TRUE>: -# CONFIG = "static" "internal_module" # _LOADED = "qt_module" diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt index b266f60b48..01c73e4919 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt @@ -28,6 +28,4 @@ add_qt_plugin(qmldbg_debugger #### Keys ignored in scope 1:.:.:qmldbg_debugger.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmldebuggerservice.json" -# PLUGIN_CLASS_NAME = "QQmlDebuggerServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt index f35337d0a0..cca4d0f793 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt @@ -30,6 +30,4 @@ add_qt_plugin(qmldbg_inspector #### Keys ignored in scope 1:.:.:qmldbg_inspector.pro:<TRUE>: # OTHER_FILES = "qqmlinspectorservice.json" -# PLUGIN_CLASS_NAME = "QQmlInspectorServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt index b2fc767c0c..377616f059 100644 --- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt @@ -18,6 +18,4 @@ add_qt_plugin(qmldbg_local #### Keys ignored in scope 1:.:.:qmldbg_local.pro:<TRUE>: # OTHER_FILES = "$$PWD/qlocalclientconnection.json" -# PLUGIN_CLASS_NAME = "QLocalClientConnectionFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt index 0b512de34d..7e2d5df4cf 100644 --- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt @@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_messages #### Keys ignored in scope 1:.:.:qmldbg_messages.pro:<TRUE>: # OTHER_FILES = "$$PWD/qdebugmessageservice.json" -# PLUGIN_CLASS_NAME = "QDebugMessageServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt index c9a5577b20..4caa79ba22 100644 --- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt @@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_native #### Keys ignored in scope 1:.:.:qmldbg_native.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlnativedebugconnector.json" -# PLUGIN_CLASS_NAME = "QQmlNativeDebugConnectorFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt index 348f2b9386..a106e2f146 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt @@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_nativedebugger #### Keys ignored in scope 1:.:.:qmldbg_nativedebugger.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlnativedebugservice.json" -# PLUGIN_CLASS_NAME = "QQmlNativeDebugServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 50ab221372..f920c602fb 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -32,6 +32,4 @@ add_qt_plugin(qmldbg_preview #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlpreviewservice.json" -# PLUGIN_CLASS_NAME = "QQmlPreviewServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt index 20b0e9803d..74999f219c 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt @@ -25,6 +25,4 @@ add_qt_plugin(qmldbg_profiler #### Keys ignored in scope 1:.:.:qmldbg_profiler.pro:<TRUE>: # OTHER_FILES = "$$PWD/qqmlprofilerservice.json" -# PLUGIN_CLASS_NAME = "QQmlProfilerServiceFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt index d18b0eb3e0..ad88af46bb 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt @@ -25,6 +25,4 @@ add_qt_plugin(qmldbg_quickprofiler #### Keys ignored in scope 1:.:.:qmldbg_quickprofiler.pro:<TRUE>: # OTHER_FILES = "qquickprofileradapter.json" -# PLUGIN_CLASS_NAME = "QQuickProfilerAdapterFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt index 9d9fb49a1f..30045f9fa3 100644 --- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt @@ -20,6 +20,4 @@ add_qt_plugin(qmldbg_server #### Keys ignored in scope 1:.:.:qmldbg_server.pro:<TRUE>: # OTHER_FILES = "qqmldebugserver.json" -# PLUGIN_CLASS_NAME = "QQmlDebugServerFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt index 9654a38aba..04cfcddc8e 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt @@ -19,6 +19,4 @@ add_qt_plugin(qmldbg_tcp #### Keys ignored in scope 1:.:.:qmldbg_tcp.pro:<TRUE>: # OTHER_FILES = "$$PWD/qtcpserverconnection.json" -# PLUGIN_CLASS_NAME = "QTcpServerConnectionFactory" -# PLUGIN_TYPE = "qmltooling" # _LOADED = "qt_plugin" diff --git a/src/plugins/scenegraph/.prev_CMakeLists.txt b/src/plugins/scenegraph/.prev_CMakeLists.txt new file mode 100644 index 0000000000..b41ceed2b8 --- /dev/null +++ b/src/plugins/scenegraph/.prev_CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from scenegraph.pro. + +if(QT_FEATURE_d3d12) + add_subdirectory(d3d12) +endif() +if(QT_FEATURE_openvg) + add_subdirectory(openvg) +endif() diff --git a/src/plugins/scenegraph/CMakeLists.txt b/src/plugins/scenegraph/CMakeLists.txt index c490b19293..364c38bc8b 100644 --- a/src/plugins/scenegraph/CMakeLists.txt +++ b/src/plugins/scenegraph/CMakeLists.txt @@ -1,9 +1,10 @@ # Generated from scenegraph.pro. - +# special case begin #if(QT_FEATURE_d3d12) # add_subdirectory(d3d12) #endif() +# special case end if(QT_FEATURE_openvg) add_subdirectory(openvg) diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index 39e28e047c..f1d5e45644 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -40,10 +40,7 @@ add_qt_plugin(qsgopenvgbackend ) #### Keys ignored in scope 1:.:.:openvg.pro:<TRUE>: -# CONFIG = "egl" # OTHER_FILES = "$$PWD/openvg.json" -# PLUGIN_CLASS_NAME = "QSGOpenVGAdaptation" -# PLUGIN_TYPE = "scenegraph" # QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt." # QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)" # _LOADED = "qt_plugin" |