diff options
| author | Holger Freyther <zecke@selfish.org> | 2008-03-10 08:21:54 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2008-03-10 08:21:54 +0000 |
| commit | 73aecdc2451b2fc990204192bee1626f1149a4ee (patch) | |
| tree | 83cb6c707d05a60cbb074c88f2dbf28fde11c89e | |
| parent | fbcc2a285efb50ec78d8257b6c22ee73174b4066 (diff) | |
Qt: The suffix for the staging libdir was omitted, remove it from the libs
| -rw-r--r-- | classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | classes/qtopia4core.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index cf3419f824..9ac4945ab4 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -14,6 +14,6 @@ export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index fd8939a23f..c6a05488ef 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -5,7 +5,7 @@ inherit qmake2 # override variables set by qmake-base to compile QtopiaCore apps # export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" |