summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/qmake2.bbclass2
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch (renamed from meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch)0
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf (renamed from meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf)0
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch (renamed from meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch)0
-rw-r--r--meta/packages/qmake/qmake2-cross_2.10a.bb (renamed from meta/packages/qmake/qmake2-native_2.10a.bb)2
5 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index d0f59d2cd4..5d221cc5d5 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -3,7 +3,7 @@
3# 3#
4inherit qmake_base 4inherit qmake_base
5 5
6DEPENDS_prepend = "qmake2-native uicmoc4-native " 6DEPENDS_prepend = "qmake2-cross uicmoc4-native "
7 7
8export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" 8export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
9export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" 9export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
diff --git a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
index abebfdfa27..abebfdfa27 100644
--- a/meta/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
+++ b/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
diff --git a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/meta/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
+++ b/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
diff --git a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
index 4197dbbf64..4197dbbf64 100644
--- a/meta/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch
+++ b/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
diff --git a/meta/packages/qmake/qmake2-native_2.10a.bb b/meta/packages/qmake/qmake2-cross_2.10a.bb
index 84df0ef732..99fe90722a 100644
--- a/meta/packages/qmake/qmake2-native_2.10a.bb
+++ b/meta/packages/qmake/qmake2-cross_2.10a.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/${QTVER}"
15 15
16# we need the real target system here 16# we need the real target system here
17CROSS_SYS := "${TARGET_SYS}" 17CROSS_SYS := "${TARGET_SYS}"
18inherit autotools native 18inherit autotools cross
19 19
20export QTDIR = "${S}" 20export QTDIR = "${S}"
21EXTRA_OEMAKE = "-e" 21EXTRA_OEMAKE = "-e"