diff options
| -rw-r--r-- | classes/qt4x11.bbclass | 1 | ||||
| -rw-r--r-- | packages/qt/qt4-x11-free_4.1.1.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index f0844d81e1..afa840f5db 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -6,6 +6,7 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" +export OE_QMAKE_LINK="${CXX}" export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 755510cc7d..1d365c3b01 100644 --- a/packages/qt/qt4-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -35,7 +35,7 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -nosse \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -verbose -no-stl -no-accessibility" + -verbose -stl -no-accessibility" EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ |