summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake-base.oeclass5
-rw-r--r--classes/qt3x11.oeclass0
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/qmake-base.oeclass b/classes/qmake-base.oeclass
index 798ad5cde0..b6890369d1 100644
--- a/classes/qmake-base.oeclass
+++ b/classes/qmake-base.oeclass
@@ -9,7 +9,7 @@ EXTRA_OEMAKE = ' MAKEFLAGS= '
export OE_QMAKE_CC="${CC}"
export OE_QMAKE_CFLAGS="${CFLAGS}"
export OE_QMAKE_CXX="${CXX}"
-export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
+export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
export OE_QMAKE_LDFLAGS="${LDFLAGS}"
export OE_QMAKE_LINK="${CCLD}"
export OE_QMAKE_AR="${AR}"
@@ -18,9 +18,10 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic"
export OE_QMAKE_MOC="${STAGING_BINDIR}/moc"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-# default to QTDIR
+# default to qte2 via oe.conf, inherit qt3x11 to configure for qt3x11
export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT="qte"
oe_qmake_mkspecs () {
mkdir -p mkspecs/${OE_QMAKE_PLATFORM}
diff --git a/classes/qt3x11.oeclass b/classes/qt3x11.oeclass
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/classes/qt3x11.oeclass