qmake2: Define env var for strip. Convert to use INC_PR.

diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index f2631b5..9791842 100644 (file)
--- a/recipes/qmake/qmake2.inc
+++ b/recipes/qmake/qmake2.inc
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r12"
+INC_PR = "r12"
 
 # We call 'moc' during the build 
 DEPENDS = "qt4-tools-native"

diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb
index 77d909f..d8bb528 100644 (file)
--- a/recipes/qmake/qmake2_2.10a.bb
+++ b/recipes/qmake/qmake2_2.10a.bb
@@ -1,5 +1,6 @@
 QTVERSION="4.4.3"
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2"
+PR = "${INC_PR}.1"
 
 BBCLASSEXTEND = "native sdk"
 
@@ -22,6 +23,7 @@ do_install() {
     echo 'export OE_QMAKE_CC=gcc' >> $script
     echo 'export OE_QMAKE_CXX=g++' >> $script
     echo 'export OE_QMAKE_LINK=g++' >> $script
+    echo 'export OE_QMAKE_STRIP=strip' >> $script
     echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
     echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qtopia' >> $script
     echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script
@@ -39,6 +41,7 @@ do_install() {
     echo 'export OE_QMAKE_CC=gcc' >> $script
     echo 'export OE_QMAKE_CXX=g++' >> $script
     echo 'export OE_QMAKE_LINK=g++' >> $script
+    echo 'export OE_QMAKE_STRIP=strip' >> $script
     echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
     echo 'export OE_QMAKE_INCDIR_QT=${includedir}/qt4' >> $script
     echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script