summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-10-27 18:05:13 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-10-27 18:05:13 +0000
commit9b2eb27d9d81380977566cce6e4219e37ad028ea (patch)
tree1d5095809386c7f0596e6262fae6998341fcac9d /classes
parentff01096b527823e32b76fe033f448f3c0e12ebe6 (diff)
add more support for Qt linking against X11
BKrev: 417fe359oXQ-ArLffi_6BthchUd59A
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake-base.oeclass1
-rw-r--r--classes/qt3x11.oeclass1
2 files changed, 2 insertions, 0 deletions
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"