From: Michael Lauer Date: Thu, 23 Dec 2004 21:38:17 +0000 (+0000) Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~15600 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf68301c82c0e3609c7d9e0e62430d64e7243afd;p=openembedded.git Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/12/23 22:38:06+01:00 uni-frankfurt.de!mickeyl upgrade qmake to 1.08a from Qt/Embedded 4.0.0b1. We now use qmakes real version instead of that of the corresponding Qt version BKrev: 41cb3ac9qARiUlWdYaf1YXEg9y0Jfg --- diff --git a/packages/qmake/qmake-native-3.2.3/common.pro b/packages/qmake/qmake-native-1.08a/common.pro similarity index 100% rename from packages/qmake/qmake-native-3.2.3/common.pro rename to packages/qmake/qmake-native-1.08a/common.pro diff --git a/packages/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/packages/qmake/qmake-native-1.08a/linux-oe-qmake.conf similarity index 100% rename from packages/qmake/qmake-native-3.2.3/linux-oe-qmake.conf rename to packages/qmake/qmake-native-1.08a/linux-oe-qmake.conf diff --git a/packages/qmake/qmake-native-3.2.3/ramses/linux-oe-qmake.conf b/packages/qmake/qmake-native-1.08a/ramses/linux-oe-qmake.conf similarity index 100% rename from packages/qmake/qmake-native-3.2.3/ramses/linux-oe-qmake.conf rename to packages/qmake/qmake-native-1.08a/ramses/linux-oe-qmake.conf diff --git a/packages/qmake/qmake-native_3.2.3.bb b/packages/qmake/qmake-native_1.08a.bb similarity index 100% rename from packages/qmake/qmake-native_3.2.3.bb rename to packages/qmake/qmake-native_1.08a.bb