diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 13:53:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 14:05:23 +0000 |
| commit | 14492ecee2e34843efd3ef070503a43a48552055 (patch) | |
| tree | 37432296f2f6bbc596d2470f79c99ce68801567c /src/plugins | |
| parent | 26c5243491f495194f04b449128dae36118e28da (diff) | |
CMake: Regenerate and adapt to merge from devwip/cmake
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/scenegraph/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/scenegraph/CMakeLists.txt | 6 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/plugins/qmltooling/CMakeLists.txt b/src/plugins/qmltooling/CMakeLists.txt index c692f4c9be..01cd40ffbb 100644 --- a/src/plugins/qmltooling/CMakeLists.txt +++ b/src/plugins/qmltooling/CMakeLists.txt @@ -19,6 +19,6 @@ if(TARGET Qt::Quick) add_subdirectory(qmldbg_inspector) add_subdirectory(qmldbg_quickprofiler) endif() -if(QT_FEATURE_qml_network AND TARGET Qt::Quick) +if(QT_FEATURE_qml_network AND QT_FEATURE_settings AND TARGET Qt::Quick) add_subdirectory(qmldbg_preview) endif() diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 3ef787cad3..908fd961fe 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -8,6 +8,7 @@ qt_add_plugin(QQmlPreviewServiceFactory OUTPUT_NAME qmldbg_preview TYPE qmltooling SOURCES + qqmldebugtranslationservice.cpp qqmldebugtranslationservice.h qqmlpreviewblacklist.cpp qqmlpreviewblacklist.h qqmlpreviewfileengine.cpp qqmlpreviewfileengine.h qqmlpreviewfileloader.cpp qqmlpreviewfileloader.h diff --git a/src/plugins/scenegraph/.prev_CMakeLists.txt b/src/plugins/scenegraph/.prev_CMakeLists.txt index b41ceed2b8..0e65d182ee 100644 --- a/src/plugins/scenegraph/.prev_CMakeLists.txt +++ b/src/plugins/scenegraph/.prev_CMakeLists.txt @@ -1,8 +1,5 @@ # 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 364c38bc8b..0e65d182ee 100644 --- a/src/plugins/scenegraph/CMakeLists.txt +++ b/src/plugins/scenegraph/CMakeLists.txt @@ -1,11 +1,5 @@ # 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) endif() |