diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:49:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:56 +0100 |
| commit | bc64ccbf00ba09e54240015bc476914b9f4f893d (patch) | |
| tree | f9c178fe5572b03571245427bb7d46fbca43484a /src/plugins | |
| parent | c2f167b41284cee3570434deba85f26f14ff241f (diff) | |
Re-generate various CMake projects and configure after merge
Change-Id: I02f5926c6664aab518c5c81e0c33dca0818a1871
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt index c58fb31aea..6727afcb89 100644 --- a/src/plugins/platforms/.prev_CMakeLists.txt +++ b/src/plugins/platforms/.prev_CMakeLists.txt @@ -3,10 +3,10 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) add_subdirectory(android) endif() -if(NOT ANDROID) +if(NOT ANDROID AND NOT WASM) add_subdirectory(minimal) endif() -if(QT_FEATURE_freetype AND NOT ANDROID) +if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM) add_subdirectory(offscreen) endif() if(QT_FEATURE_xcb) diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index 442596286a..c01dc5b28a 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -3,10 +3,10 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) add_subdirectory(android) endif() -if(NOT ANDROID) +if(NOT ANDROID AND NOT WASM) add_subdirectory(minimal) endif() -if(QT_FEATURE_freetype AND NOT ANDROID) +if(QT_FEATURE_freetype AND NOT ANDROID AND NOT WASM) add_subdirectory(offscreen) endif() if(QT_FEATURE_xcb) diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 3a330e2b7b..24a93677a2 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -1,4 +1,4 @@ -# Generated from ios.pro. +# Generated from kernel.pro. ##################################################################### ## QIOSIntegrationPlugin Plugin: @@ -32,13 +32,15 @@ add_qt_plugin(QIOSIntegrationPlugin ${FWQuartzCore} ${FWUIKit} Qt::ClipboardSupportPrivate + Qt::Core Qt::CorePrivate Qt::FontDatabaseSupportPrivate Qt::GraphicsSupportPrivate + Qt::Gui Qt::GuiPrivate ) -#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>: +#### Keys ignored in scope 1:.:.:kernel.pro:<TRUE>: # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm" ## Scopes: @@ -52,6 +54,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm + qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm qiosfiledialog.h qiosfiledialog.mm qiosmenu.h qiosmenu.mm qiosmessagedialog.h qiosmessagedialog.mm @@ -60,6 +63,5 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS ${FWAssetsLibrary} ) -#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -add_subdirectory(optional) |