summaryrefslogtreecommitdiff
path: root/packages/qmake
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-07 00:34:07 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-07 00:34:07 +0000
commit2f8521c6d1173dd650d9ae2bba8c18e690fa3b1f (patch)
tree06bc2b997b60797bc42f696f3427f92890089d2b /packages/qmake
parent0d0bf315513039bd8560ac91865c7174e789d675 (diff)
parent6e90aae26efa66553063b74b9afa9563b70fb982 (diff)
merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
and '6ab53da82d157971966f5a17d0c29d54df22cac9'
Diffstat (limited to 'packages/qmake')
-rw-r--r--packages/qmake/qmake2-native-2.10a/.mtn2git_empty (renamed from packages/qmake/qmake2-native-2.01a/.mtn2git_empty)0
-rw-r--r--packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch (renamed from packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch)0
-rw-r--r--packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf (renamed from packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf)0
-rw-r--r--packages/qmake/qmake2-native_2.10a.bb (renamed from packages/qmake/qmake2-native_2.01a.bb)9
4 files changed, 4 insertions, 5 deletions
diff --git a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty
+++ b/packages/qmake/qmake2-native-2.10a/.mtn2git_empty
diff --git a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
index abebfdfa27..abebfdfa27 100644
--- a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch
+++ b/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch
diff --git a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf
diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 2ec783574c..207aaaf9b5 100644
--- a/packages/qmake/qmake2-native_2.01a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "TrollTech Makefile Generator"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
-LICENSE = "GPL QPL"
+LICENSE = "GPL"
+PR = "r0"
-PR = "r2"
-
-QTVER = "qt-x11-opensource-src-4.3.0"
+QTVER = "qtopia-core-opensource-src-4.3.1"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
- file://0001-fix-mkspecs.patch;patch=1 \
+ file://0001-fix-mkspecs.patch;patch=1 \
file://linux-oe-qmake.conf"
S = "${WORKDIR}/${QTVER}"