summaryrefslogtreecommitdiff
path: root/packages/qmake
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-10 10:41:04 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-10 10:41:04 +0000
commit08d0d4e3b4423bc6884d933f5d97bb1523aff05b (patch)
tree0acb422c03a9c6220c70a62c2c7df3d599b1b978 /packages/qmake
parentb7712b20c91440b52877c1ec228d8d3f0e7379be (diff)
qmake: upgrade version 2.00a to qt 4.1.1
give up with trying to make qmake2 work with old stuff, instead start to make qmake1 and qmake2 coexist in staging
Diffstat (limited to 'packages/qmake')
-rw-r--r--packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch16
-rw-r--r--packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch30
-rw-r--r--packages/qmake/qmake2-native-2.00a/.mtn2git_empty (renamed from packages/qmake/qmake-native-2.00a/.mtn2git_empty)0
-rw-r--r--packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf (renamed from packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf)0
-rw-r--r--packages/qmake/qmake2-native_2.00a.bb (renamed from packages/qmake/qmake-native_2.00a.bb)8
5 files changed, 3 insertions, 51 deletions
diff --git a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch
deleted file mode 100644
index 866864ad1f..0000000000
--- a/packages/qmake/qmake-native-2.00a/old-moc-compatibility.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp~old-moc-compatibility.patch
-+++ qt-embedded-opensource-4.0.0-b1/qmake/generators/makefile.cpp
-@@ -950,7 +950,7 @@
- deps += "$(MOC) ";
- deps += (*it) + " " + findDependencies((m)).join(" ");
- t << m << ": " << deps << "\n\t"
-- << "$(MOC)" << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ")
-+ << "$(MOC) " /* << " $(DEFINES) $(INCPATH) " << varGlue("QMAKE_COMPILER_DEFINES","-D"," -D"," ") */
- << (*it) << " -o " << m << endl << endl;
- }
- }
diff --git a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch b/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
deleted file mode 100644
index 3a985600fa..0000000000
--- a/packages/qmake/qmake-native-2.00a/old-uic-compatibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf~old-uic-compatibility.patch
-+++ qt-embedded-opensource-4.0.0-b1/mkspecs/features/uic.prf
-@@ -13,8 +13,8 @@
- isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
- isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR
-
--uic.commands = $$QMAKE_UIC -3 $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
--uic.output = $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+uic.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
- uic.input = FORMS
- uic.variable_out = HEADERS
- uic.CONFIG += no_link
-@@ -24,9 +24,9 @@
- INCLUDEPATH += $$UI_HEADERS_DIR
-
- uic3 {
-- uic3_decl.commands = $$QMAKE_UIC3 -decl ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+ uic3_decl.commands = $$QMAKE_UIC3 -decl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
- uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-- uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/ui_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+ uic3_decl.depends = $$QMAKE_UIC3 $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
- uic3_decl.input = FORMS
- uic3_decl.CONFIG += no_link
- uic3_decl.variable_out = HEADERS
diff --git a/packages/qmake/qmake-native-2.00a/.mtn2git_empty b/packages/qmake/qmake2-native-2.00a/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qmake/qmake-native-2.00a/.mtn2git_empty
+++ b/packages/qmake/qmake2-native-2.00a/.mtn2git_empty
diff --git a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf
index d803f036fc..d803f036fc 100644
--- a/packages/qmake/qmake-native-2.00a/linux-oe-qmake.conf
+++ b/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf
diff --git a/packages/qmake/qmake-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 31e8a0d755..41bc5c7755 100644
--- a/packages/qmake/qmake-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -4,11 +4,9 @@ HOMEPAGE = "http://www.trolltech.com"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
SECTION = "devel"
LICENSE = "GPL QPL"
-PR = "r5"
+PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
-QTVER = "qt-x11-opensource-src-4.0.1"
+QTVER = "qt-x11-opensource-src-4.1.1"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://linux-oe-qmake.conf"
@@ -40,7 +38,7 @@ do_compile() {
}
do_stage() {
- install -m 0755 bin/qmake ${STAGING_BINDIR}
+ install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
install -d ${QMAKE_MKSPEC_PATH}
cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH}
}