summaryrefslogtreecommitdiff
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 d0f59d2cd..5d221cc5d 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -3,7 +3,7 @@
#
inherit qmake_base
-DEPENDS_prepend = "qmake2-native uicmoc4-native "
+DEPENDS_prepend = "qmake2-cross uicmoc4-native "
export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
export 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 abebfdfa2..abebfdfa2 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 f58481a69..f58481a69 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 4197dbbf6..4197dbbf6 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 84df0ef73..99fe90722 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}"
# we need the real target system here
CROSS_SYS := "${TARGET_SYS}"
-inherit autotools native
+inherit autotools cross
export QTDIR = "${S}"
EXTRA_OEMAKE = "-e"