From 69004cb2900dcfc530e1e2efb783f559661a8a50 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 7 Sep 2020 17:28:00 +0200 Subject: 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 --- src/gui/.prev_CMakeLists.txt | 2 +- src/gui/CMakeLists.txt | 2 +- src/gui/opengl/platform/unix/unix.pri | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui') diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 65780b44cf..5b4c581bed 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -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 SOURCES opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h - PUBLIC_LIBRARIES + LIBRARIES X11::X11 ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 1804991a7a..dc7d28d0f1 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -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 SOURCES opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h - PUBLIC_LIBRARIES + LIBRARIES X11::X11 ) diff --git a/src/gui/opengl/platform/unix/unix.pri b/src/gui/opengl/platform/unix/unix.pri index 7acc589114..6365a18756 100644 --- a/src/gui/opengl/platform/unix/unix.pri +++ b/src/gui/opengl/platform/unix/unix.pri @@ -4,4 +4,4 @@ HEADERS += \ SOURCES += \ opengl/platform/unix/qglxconvenience.cpp -QMAKE_USE += xlib +QMAKE_USE_PRIVATE += xlib -- cgit v1.2.3