diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-03-10 10:18:53 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-03-10 10:18:53 +0000 |
| commit | 42565b03e846f7ae4e153bd6ffe9cb702daaf926 (patch) | |
| tree | 4d533b24b1c28acdfdf4bc52d1b79db89024eaad /classes | |
| parent | 03ebacf98db248bac9b68d83680027acd2a4a023 (diff) | |
| parent | 587f9f658071292d11491ef26cb2d81f0e3c9e42 (diff) | |
merge of '3d608e2b9463b14c4a0a12230196b70080b1513d'
and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'
Diffstat (limited to 'classes')
| -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" |