diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/android/.prev_CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/plugins/platforms/android/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/.prev_CMakeLists.txt | 34 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 34 |
4 files changed, 50 insertions, 30 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 214576b6df..bc11188e14 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -6,7 +6,7 @@ add_qt_plugin(qtforandroid TYPE platforms - OUTPUT_DIRECTORY "$$DESTDIR/android" + CLASS_NAME QAndroidIntegrationPlugin SOURCES androidcontentfileengine.cpp androidcontentfileengine.h androiddeadlockprotector.cpp androiddeadlockprotector.h @@ -17,6 +17,7 @@ add_qt_plugin(qtforandroid androidjnimenu.cpp androidjnimenu.h androidplatformplugin.cpp androidsurfaceclient.h + main.cpp qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h qandroideventdispatcher.cpp qandroideventdispatcher.h qandroidinputcontext.cpp qandroidinputcontext.h @@ -39,8 +40,6 @@ add_qt_plugin(qtforandroid qandroidplatformtheme.cpp qandroidplatformtheme.h qandroidplatformwindow.cpp qandroidplatformwindow.h qandroidsystemlocale.cpp qandroidsystemlocale.h - DEFINES - QT_STATICPLUGIN INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android @@ -65,7 +64,6 @@ add_qt_plugin(qtforandroid #### Keys ignored in scope 1:.:.:android.pro:<TRUE>: # OTHER_FILES = "$$PWD/android.json" # _LOADED = "qt_plugin" -# target.path = "$${target.path}/android" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index f8d23e8371..331ec21fe5 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -6,7 +6,7 @@ add_qt_plugin(qtforandroid TYPE platforms - # OUTPUT_DIRECTORY "$$DESTDIR/android" # special case remove + CLASS_NAME QAndroidIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case SOURCES androidcontentfileengine.cpp androidcontentfileengine.h @@ -18,6 +18,7 @@ add_qt_plugin(qtforandroid androidjnimenu.cpp androidjnimenu.h androidplatformplugin.cpp androidsurfaceclient.h + main.cpp qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h qandroideventdispatcher.cpp qandroideventdispatcher.h qandroidinputcontext.cpp qandroidinputcontext.h @@ -40,8 +41,6 @@ add_qt_plugin(qtforandroid qandroidplatformtheme.cpp qandroidplatformtheme.h qandroidplatformwindow.cpp qandroidplatformwindow.h qandroidsystemlocale.cpp qandroidsystemlocale.h - DEFINES - QT_STATICPLUGIN INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android @@ -74,7 +73,6 @@ add_qt_plugin(qtforandroid #### Keys ignored in scope 1:.:.:android.pro:<TRUE>: # OTHER_FILES = "$$PWD/android.json" # _LOADED = "qt_plugin" -# target.path = "$${target.path}/android" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index 9e79fc3a5c..8808017a87 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -10,8 +10,6 @@ add_qt_plugin(qcocoa SOURCES main.mm messages.cpp messages.h - qcocoaaccessibility.h qcocoaaccessibility.mm - qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm qcocoaapplication.h qcocoaapplication.mm qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoabackingstore.h qcocoabackingstore.mm @@ -45,7 +43,6 @@ add_qt_plugin(qcocoa qnswindow.h qnswindow.mm qnswindowdelegate.h qnswindowdelegate.mm LIBRARIES - Qt::AccessibilitySupportPrivate Qt::ClipboardSupportPrivate Qt::CorePrivate Qt::FontDatabaseSupportPrivate @@ -62,7 +59,6 @@ add_qt_plugin(qcocoa ${FWMetal} ${FWQuartzCore} Cups::Cups - Qt::AccessibilitySupport Qt::ClipboardSupport Qt::Core Qt::FontDatabaseSupport @@ -107,23 +103,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) +extend_target(qcocoa CONDITION QT_FEATURE_accessibility + SOURCES + qcocoaaccessibility.h qcocoaaccessibility.mm + qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm + LIBRARIES + Qt::AccessibilitySupportPrivate + PUBLIC_LIBRARIES + Qt::AccessibilitySupport +) + extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES - qcocoaprintdevice.h qcocoaprintdevice.mm - qcocoaprintersupport.h qcocoaprintersupport.mm qpaintengine_mac.mm qpaintengine_mac_p.h - qprintengine_mac.mm qprintengine_mac_p.h LIBRARIES - Qt::PrintSupportPrivate Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::PrintSupport Qt::Widgets ) -#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets: +#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" +extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets + SOURCES + qcocoaprintdevice.h qcocoaprintdevice.mm + qcocoaprintersupport.h qcocoaprintersupport.mm + qprintengine_mac.mm qprintengine_mac_p.h + LIBRARIES + Qt::PrintSupportPrivate + PUBLIC_LIBRARIES + Qt::PrintSupport +) + extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm @@ -139,5 +151,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) -#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index c756db6b5a..53b56da5f1 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -14,8 +14,6 @@ add_qt_plugin(qcocoa SOURCES main.mm messages.cpp messages.h - qcocoaaccessibility.h qcocoaaccessibility.mm - qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm qcocoaapplication.h qcocoaapplication.mm qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoabackingstore.h qcocoabackingstore.mm @@ -49,7 +47,6 @@ add_qt_plugin(qcocoa qnswindow.h qnswindow.mm qnswindowdelegate.h qnswindowdelegate.mm LIBRARIES - Qt::AccessibilitySupportPrivate Qt::ClipboardSupportPrivate Qt::CorePrivate Qt::FontDatabaseSupportPrivate @@ -66,7 +63,6 @@ add_qt_plugin(qcocoa ${FWMetal} ${FWQuartzCore} Cups::Cups - Qt::AccessibilitySupport Qt::ClipboardSupport Qt::Core Qt::FontDatabaseSupport @@ -111,23 +107,39 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) +extend_target(qcocoa CONDITION QT_FEATURE_accessibility + SOURCES + qcocoaaccessibility.h qcocoaaccessibility.mm + qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm + LIBRARIES + Qt::AccessibilitySupportPrivate + PUBLIC_LIBRARIES + Qt::AccessibilitySupport +) + extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES - qcocoaprintdevice.h qcocoaprintdevice.mm - qcocoaprintersupport.h qcocoaprintersupport.mm qpaintengine_mac.mm qpaintengine_mac_p.h - qprintengine_mac.mm qprintengine_mac_p.h LIBRARIES - Qt::PrintSupportPrivate Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::PrintSupport Qt::Widgets ) -#### Keys ignored in scope 5:.:.:cocoa.pro:TARGET Qt::Widgets: +#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" +extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets + SOURCES + qcocoaprintdevice.h qcocoaprintdevice.mm + qcocoaprintersupport.h qcocoaprintersupport.mm + qprintengine_mac.mm qprintengine_mac_p.h + LIBRARIES + Qt::PrintSupportPrivate + PUBLIC_LIBRARIES + Qt::PrintSupport +) + extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm @@ -143,5 +155,5 @@ extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) -#### Keys ignored in scope 9:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" |