merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'

     and 'e5e5a9814f67f07864e0b56012257f49ace89669'

9 files changed, 28 insertions, 5 deletions

diff --git a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch
index e0ebe512c8..e0ebe512c8 100644
--- a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
+++ b/packages/qmake/files/0001-fix-mkspecs.patch
diff --git a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch b/packages/qmake/files/0008-backport-qt-lib-infix.patch
index f87576a07b..f87576a07b 100644
--- a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch
+++ b/packages/qmake/files/0008-backport-qt-lib-infix.patch
diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/files/qt-config.patch
index b2d86de2c5..b2d86de2c5 100644
--- a/packages/qmake/qmake2-native/qt-config.patch
+++ b/packages/qmake/files/qt-config.patch
diff --git a/packages/qmake/qmake2-native/use-lflags-last.patch b/packages/qmake/files/use-lflags-last.patch
index 4197dbbf64..4197dbbf64 100644
--- a/packages/qmake/qmake2-native/use-lflags-last.patch
+++ b/packages/qmake/files/use-lflags-last.patch
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index c609fefb81..f7bdd7836b 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -7,7 +7,6 @@ PR = "r2"
 
 QTVER = "qtopia-core-opensource-src-${QTVERSION}"
 
-FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
            file://0008-backport-qt-lib-infix.patch;patch=1 \
@@ -18,7 +17,7 @@ S = "${WORKDIR}/${QTVER}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools cross 
+inherit autotools  
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
@@ -63,6 +62,3 @@ do_stage() {
     cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
 }
 
-do_install() {
-    :
-}
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 89b2ae5a82..0e1aa2c61e 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -1,2 +1,11 @@
 QTVERSION="4.3.3"
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
 require ${PN}.inc
+
+inherit cross
+
+do_install() {
+    :
+}
+
+
diff --git a/packages/qmake/qmake2-sdk/.mtn2git_empty b/packages/qmake/qmake2-sdk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qmake/qmake2-sdk/.mtn2git_empty
diff --git a/packages/qmake/qmake2-sdk/linux-oe-qmake.conf b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf
new file mode 100644
index 0000000000..f58481a693
--- /dev/null
+++ b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf
@@ -0,0 +1 @@
+include(../linux-g++/qmake.conf)
diff --git a/packages/qmake/qmake2-sdk_2.10a.bb b/packages/qmake/qmake2-sdk_2.10a.bb
new file mode 100644
index 0000000000..b16159c8d9
--- /dev/null
+++ b/packages/qmake/qmake2-sdk_2.10a.bb
@@ -0,0 +1,17 @@
+QTVERSION="4.3.3"
+require qmake2-native.inc
+
+inherit sdk
+
+do_install () {
+	install -d ${D}/${bindir}
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake2
+    install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4
+    install -d ${D}/${datadir}/qt4
+    cp -PfR mkspecs ${D}/${datadir}/qt4/
+}
+
+
+
+
+