diff options
| author | Philip Balister <philip@balister.org> | 2007-08-23 14:37:17 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-08-23 14:37:17 +0000 |
| commit | b750ffba347c1f8bb7dbbe42abf31f17bf4db56c (patch) | |
| tree | b9a1078d4e94279f20e3cc85cd347e1536371515 /packages/qmake | |
| parent | 613aee0a21460812751113c870f82119cd31a3e0 (diff) | |
| parent | b486be9688c105f666ba4f85907cf02c04d6fba6 (diff) | |
merge of '0632006dcadf27825774caa5189b1ab23bd8b08e'
and '215bca295ed86f179e1bb5082f01a1186b910b0d'
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) | 5 |
4 files changed, 2 insertions, 3 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..94b2002a20 100644 --- a/packages/qmake/qmake2-native_2.01a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -3,10 +3,9 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" +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 \ |