diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-07 17:28:00 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-11 00:41:13 +0200 |
| commit | 69004cb2900dcfc530e1e2efb783f559661a8a50 (patch) | |
| tree | 34a177a1ab5df628745380d7721dbe57d487cb89 /src/plugins | |
| parent | 0f4422113cec41f2f3544c03b91d8d6220dff360 (diff) | |
Do not expose xlib as public dependency of QtGui
Consumers of QtGui should link explicitly to xlib if needed.
Fixes: QTBUG-86421
Change-Id: Ibc94eb1c1ac405b53749b320c388b037bf693a08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/offscreen/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/offscreen.pro | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index c69719dda7..319502ccc6 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -30,6 +30,8 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h + LIBRARIES + X11::X11 ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index ee738851e5..7a312701c6 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -31,6 +31,8 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h + LIBRARIES + X11::X11 ) #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index 8b11e5ca74..6be725af7e 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -19,6 +19,7 @@ OTHER_FILES += offscreen.json qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) { SOURCES += qoffscreenintegration_x11.cpp HEADERS += qoffscreenintegration_x11.h + QMAKE_USE_PRIVATE += xlib } PLUGIN_TYPE = platforms |