summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-14 08:39:13 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-14 08:39:13 +0000
commit1bb6810f0190c114aac654627547808b3f301fab (patch)
tree8a732b784375be8eb39c8fb877c0c3627689a070 /packages
parent3b2a3f2b9068f9ee61070efe2ea0ab660cf5a1f3 (diff)
parent1b0cbb809e09eddff243e874edff54a4b0c25626 (diff)
merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
and 'aa0f52125342f4a172e931fd7a8aa4d951d9f7ec'
Diffstat (limited to 'packages')
-rw-r--r--packages/qmake/files/0001-fix-mkspecs.patch (renamed from packages/qmake/qmake2-native/0001-fix-mkspecs.patch)0
-rw-r--r--packages/qmake/files/0008-backport-qt-lib-infix.patch (renamed from packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch)0
-rw-r--r--packages/qmake/files/qt-config.patch (renamed from packages/qmake/qmake2-native/qt-config.patch)0
-rw-r--r--packages/qmake/files/use-lflags-last.patch (renamed from packages/qmake/qmake2-native/use-lflags-last.patch)0
-rw-r--r--packages/qmake/qmake2-native.inc1
-rw-r--r--packages/qmake/qmake2-native_2.10a.bb1
-rw-r--r--packages/qmake/qmake2-sdk/.mtn2git_empty0
-rw-r--r--packages/qmake/qmake2-sdk/linux-oe-qmake.conf1
-rw-r--r--packages/qmake/qmake2-sdk_2.10a.bb4
9 files changed, 6 insertions, 1 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..55b402655e 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 \
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 89b2ae5a82..07e97c4413 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -1,2 +1,3 @@
QTVERSION="4.3.3"
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
require ${PN}.inc
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..3c00d81cdc
--- /dev/null
+++ b/packages/qmake/qmake2-sdk_2.10a.bb
@@ -0,0 +1,4 @@
+QTVERSION="4.3.3"
+require qmake2-native.inc
+
+inherit sdk