From b0e6bc42ebec357816d53456d3ef214f9fb8754c Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@digia.com>
Date: Tue, 4 Feb 2014 11:54:44 +0100
Subject: [PATCH] Set QMAKE_X11_PREFIX also when Qt configure with -qt-xcb

Change-Id: Ib9ca7edb1e914275a415b6c74ef691838415a40f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 5979935d33..529471d0c4 100755
--- a/configure
+++ b/configure
@@ -5193,6 +5193,14 @@ if [ "$CFG_XCB" != "no" ]; then
         QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
         QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`"
     fi
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
+        QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
+    else
+        # default to LSB prefix
+        QMAKE_X11_PREFIX="/usr"
+    fi
+    QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX"
+
     if compileTest qpa/xcb "xcb" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
 
         if [ "$CFG_XCB" = "qt" ]; then
@@ -5200,14 +5208,6 @@ if [ "$CFG_XCB" != "no" ]; then
         else
             CFG_XCB="system"
 
-            if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
-                QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
-            else
-                # default to LSB prefix
-                QMAKE_X11_PREFIX="/usr"
-            fi
-            QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX"
-
             if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
                 XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm"
                 QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"