|author||Oswald Buddenhagen <firstname.lastname@example.org>||2013-11-13 19:14:45 +0100|
|committer||The Qt Project <email@example.com>||2013-12-03 11:41:12 +0100|
Revert "configure: Abort if Xlib isn't present when building for XCB."
the change is wrong for multiple reasons: - it is possible to build qt (the offscreen plugin) with xlib but without xcb, which was impossible after the change - the check was built in a way that if xcb is auto-detected but xlib is missing, configure would abort (instead of disabling xcb), which is unreasonable (cf. linked task) - it should be possible to build the xcb plugin without xlib - it's testing for xcb-xlib and should have the correct #ifdefs. if these are broken, they should be fixed. if this is unrealistic, the build system should be adjusted to this fact ... differently. This reverts commit 683451e7c74d23abb0268a187d28cf7dc7afd032. Task-number: QTBUG-34382 Change-Id: I1c5811e2fb1f09b084b6aeb7350e5f376e1b9b82 Reviewed-by: Nicolás Alvarez <firstname.lastname@example.org> Reviewed-by: Jørgen Lind <email@example.com>
Diffstat (limited to 'configure')
1 files changed, 5 insertions, 11 deletions
@@ -5080,6 +5080,11 @@ if [ "$CFG_TSLIB" != "no" ]; then
+# Check we actually have X11 :-)
+if compileTest x11/xlib "XLib"; then
+ QT_CONFIG="$QT_CONFIG xlib"
if [ "$CFG_XCB" != "no" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
@@ -5125,17 +5130,6 @@ if [ "$CFG_XCB" != "no" ]; then
- # Check for X11. Eventually we should port everything to XCB,
- # but for now the port is incomplete and Xlib is a requirement.
- if compileTest x11/xlib "XLib"; then
- QT_CONFIG="$QT_CONFIG xlib"
- echo "The test for linking against Xlib failed!"
- echo " You might need to install dependency packages."
- echo " See src/plugins/platforms/xcb/README."
- exit 1
if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then