diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 18:07:31 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 23:22:47 +0200 |
| commit | 77771116a4d43e4832494785bc0abde8f3d8fd58 (patch) | |
| tree | da36c5c63a63697243b1c8044b55be20dc8b1ae5 /src/plugins/platforms/ios | |
| parent | a9fbe539669d6b22b6d790b02b73e40f1b9ede06 (diff) | |
CMake: Regenerate src/plugins
Change-Id: Icceceeb42023e7fa5edf320bb21f03d11bd357b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/.prev_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 16 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt index 8916e1772b..d38f7c813e 100644 --- a/src/plugins/platforms/ios/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## QIOSIntegrationPlugin Plugin: ##################################################################### -add_qt_plugin(QIOSIntegrationPlugin +qt_internal_add_plugin(QIOSIntegrationPlugin OUTPUT_NAME qios TYPE platforms SOURCES @@ -31,10 +31,7 @@ add_qt_plugin(QIOSIntegrationPlugin ${FWFoundation} ${FWQuartzCore} ${FWUIKit} - Qt::ClipboardSupportPrivate Qt::CorePrivate - Qt::FontDatabaseSupportPrivate - Qt::GraphicsSupportPrivate Qt::GuiPrivate ) @@ -44,12 +41,12 @@ add_qt_plugin(QIOSIntegrationPlugin ## Scopes: ##################################################################### -extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) -extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 6acff8b074..06c64e10ad 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -1,10 +1,10 @@ -# Generated from kernel.pro. +# Generated from ios.pro. ##################################################################### ## QIOSIntegrationPlugin Plugin: ##################################################################### -add_qt_plugin(QIOSIntegrationPlugin +qt_internal_add_plugin(QIOSIntegrationPlugin OUTPUT_NAME qios TYPE platforms SOURCES @@ -31,28 +31,25 @@ add_qt_plugin(QIOSIntegrationPlugin ${FWFoundation} ${FWQuartzCore} ${FWUIKit} - Qt::Core Qt::CorePrivate - Qt::Gui Qt::GuiPrivate ) # special case begin qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin) # special case end - -#### Keys ignored in scope 1:.:.:kernel.pro:<TRUE>: +#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>: # OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm" ## Scopes: ##################################################################### -extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm @@ -64,5 +61,6 @@ extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS ${FWAssetsLibrary} ) -#### Keys ignored in scope 5:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" +add_subdirectory(optional) |