1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not expose xlib as public dependency of QtGui

Browse Source 
Consumers of QtGui should link explicitly to xlib if needed.

Fixes: QTBUG-86421
Change-Id: Ibc94eb1c1ac405b53749b320c388b037bf693a08
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-09-07 17:28:00 +02:00
parent 0f4422113c
commit 69004cb290
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/.prev_CMakeLists.txt
View File

@ -698,7 +698,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
PUBLIC_LIBRARIES LIBRARIES
X11::X11 X11::X11
) )

2
src/gui/CMakeLists.txt
View File

@ -820,7 +820,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
PUBLIC_LIBRARIES LIBRARIES
X11::X11 X11::X11
) )

2
src/gui/opengl/platform/unix/unix.pri
View File

@ -4,4 +4,4 @@ HEADERS += \
SOURCES += \ SOURCES += \
opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience.cpp
QMAKE_USE += xlib QMAKE_USE_PRIVATE += xlib

2
src/plugins/platforms/offscreen/.prev_CMakeLists.txt
View File

@ -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 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
LIBRARIES
X11::X11
) )
#### Keys ignored in scope 3:.:.: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:

2
src/plugins/platforms/offscreen/CMakeLists.txt
View File

@ -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 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
LIBRARIES
X11::X11
) )
#### Keys ignored in scope 3:.:.: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:

1
src/plugins/platforms/offscreen/offscreen.pro
View File

@ -19,6 +19,7 @@ OTHER_FILES += offscreen.json
qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) { qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
SOURCES += qoffscreenintegration_x11.cpp SOURCES += qoffscreenintegration_x11.cpp
HEADERS += qoffscreenintegration_x11.h HEADERS += qoffscreenintegration_x11.h
QMAKE_USE_PRIVATE += xlib
} }
PLUGIN_TYPE = platforms PLUGIN_TYPE = platforms