add more support for Qt linking against X11

BKrev: 417fe359oXQ-ArLffi_6BthchUd59A

diff --git a/classes/qmake-base.oeclass b/classes/qmake-base.oeclass
index b689036..a5dd979 100644 (file)
--- a/classes/qmake-base.oeclass
+++ b/classes/qmake-base.oeclass
@@ -22,6 +22,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
 export OE_QMAKE_LIBS_QT="qte"
+export OE_QMAKE_LIBS_X11=""
 
 oe_qmake_mkspecs () {
     mkdir -p mkspecs/${OE_QMAKE_PLATFORM}

diff --git a/classes/qt3x11.oeclass b/classes/qt3x11.oeclass
index 9c3a289..2a2f3d5 100644 (file)
--- a/classes/qt3x11.oeclass
+++ b/classes/qt3x11.oeclass
@@ -8,3 +8,4 @@ export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
 export OE_QMAKE_LIBS_QT="qt"
+export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm"

diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
index 62410c5..287dbeb 100644 (file)
--- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
+++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf
@@ -52,7 +52,7 @@ QMAKE_RPATH             = -Wl,-rpath-link,
 
 QMAKE_LIBS             = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11         = 
+QMAKE_LIBS_X11         = $(OE_QMAKE_LIBS_X11)
 QMAKE_LIBS_X11SM       = 
 QMAKE_LIBS_QT          = -l$(OE_QMAKE_LIBS_QT)
 QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt