diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-06 21:50:12 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-06-06 21:50:12 +0000 |
| commit | 19785f798a814b1a415e75f2d1ec3b52e9ec65b0 (patch) | |
| tree | 82543b4822dad92f8890eef4bd819d8bbb22cabc | |
| parent | b3300251709d49fd3e30d41582fa80e3d96ff5b2 (diff) | |
| parent | 7fd7f3c145606a56284a836d2339bf535721c445 (diff) | |
merge of '95bb7c56fa20da5b09bb4a569a012dff600c92ea'
and 'de933998bda080807ad9ffbe3da30f7880f2644f'
| -rw-r--r-- | classes/palmtop.bbclass | 1 | ||||
| -rw-r--r-- | classes/qmake-base.bbclass | 2 | ||||
| -rw-r--r-- | packages/qpegps/qpegps_0.9.3.bb | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index 39b9bd2b60..e99b31aaa3 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -16,6 +16,7 @@ EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}" EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}' EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" FILES_${PN} = " ${palmtopdir} " diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 09694e97b8..5ca3ee2904 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.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" +export OE_QMAKE_LIBS_QT="${QT_LIBRARY}" export OE_QMAKE_LIBS_X11="" oe_qmake_mkspecs () { diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb index a4712f3dea..8eaaa3b2ab 100644 --- a/packages/qpegps/qpegps_0.9.3.bb +++ b/packages/qpegps/qpegps_0.9.3.bb @@ -16,6 +16,7 @@ inherit palmtop QMAKE_PROFILES = "qpegps.pro" EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps" +OE_QMAKE_CFLAGS += " -DQWS " do_install() { install -d ${D}${palmtopdir}/bin \ |