diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/plugins/platforms/offscreen/CMakeLists.txt | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/plugins/platforms/offscreen/CMakeLists.txt')
-rw-r--r-- | src/plugins/platforms/offscreen/CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 1cb5f0a456..3546f8710b 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -18,9 +18,14 @@ add_qt_plugin(qoffscreen Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::EventDispatcherSupport + Qt::FontDatabaseSupport + Qt::Gui ) -#### Keys ignored in scope 1:.:offscreen.pro:<NONE>: +#### Keys ignored in scope 1:.:.:./offscreen.pro:<TRUE>: # OTHER_FILES = "offscreen.json" # PLUGIN_CLASS_NAME = "QOffscreenIntegrationPlugin" # _LOADED = "qt_plugin" @@ -33,12 +38,9 @@ extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES Qt::GlxSupportPrivate + PUBLIC_LIBRARIES + Qt::GlxSupport ) -extend_target(qoffscreen CONDITION QT_FEATURE_opengles2 OR NOT QT_FEATURE_opengl OR NOT QT_FEATURE_xlib - SOURCES - qoffscreenintegration_dummy.cpp -) - -#### Keys ignored in scope 4:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 3:.:.:./offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" |