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/offscreen | |
| parent | a9fbe539669d6b22b6d790b02b73e40f1b9ede06 (diff) | |
CMake: Regenerate src/plugins
Change-Id: Icceceeb42023e7fa5edf320bb21f03d11bd357b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/offscreen')
| -rw-r--r-- | src/plugins/platforms/offscreen/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/CMakeLists.txt | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 45e10e6239..06861088b9 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) @@ -29,6 +28,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### +qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE + PUBLIC_LIBRARIES + Qt::FontDatabaseSupportPrivate +) + qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -36,5 +40,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 7387e083b6..5d9dd0083c 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EventDispatcherSupportPrivate - Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate ) @@ -30,6 +29,11 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### +qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE + PUBLIC_LIBRARIES + Qt::FontDatabaseSupportPrivate +) + qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h @@ -37,5 +41,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_ Qt::GlxSupportPrivate ) -#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" |