From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 27 Oct 2004 18:05:13 +0000 (+0000)
Subject: add more support for Qt linking against X11
X-Git-Tag: Release-2010-05/1~16449
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b2eb27d9d81380977566cce6e4219e37ad028ea;p=openembedded.git

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 b6890369d1..a5dd97968f 100644
--- 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 9c3a289f86..2a2f3d5bbd 100644
--- 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 62410c5f13..287dbeba19 100644
--- 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