summaryrefslogtreecommitdiff
path: root/packages/qmake
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2008-09-11 13:46:31 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2008-10-24 19:53:12 -0200
commitda70fd4cc188f70a00d622a6f0bca9844ef3b8d6 (patch)
tree6b4ca94caca814a10073d41b9b15db6f5efba28e /packages/qmake
parentcfada083d19474ea7136801b0b49b350fc8dfc44 (diff)
qmake2: properly set rcc utility to rcc4 in native stagging
Diffstat (limited to 'packages/qmake')
-rw-r--r--packages/qmake/files/0001-fix-mkspecs.patch3
-rw-r--r--packages/qmake/qmake2-native.inc4
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/qmake/files/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch
index c6f55906bc..0fccb57c04 100644
--- a/packages/qmake/files/0001-fix-mkspecs.patch
+++ b/packages/qmake/files/0001-fix-mkspecs.patch
@@ -51,7 +51,7 @@
--- /tmp/linux.conf 2008-07-08 10:32:18.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf 2008-07-08 10:38:37.000000000 +0200
-@@ -7,26 +7,27 @@
+@@ -7,26 +7,28 @@
QMAKE_INCDIR =
QMAKE_LIBDIR =
@@ -84,6 +84,7 @@
-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+QMAKE_MOC = $(OE_QMAKE_MOC)
+QMAKE_UIC = $(OE_QMAKE_UIC)
++QMAKE_RCC = $(OE_QMAKE_RCC)
-QMAKE_AR = ar cqs
+QMAKE_AR = $(OE_QMAKE_AR) cqs
diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc
index def68451ba..c9a0d400ff 100644
--- a/packages/qmake/qmake2-native.inc
+++ b/packages/qmake/qmake2-native.inc
@@ -51,7 +51,8 @@ do_configure() {
export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4"
export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4"
export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4"
- export OE_QMAKE_RCC="non-existant"
+ export OE_QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
+ export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4"
export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
@@ -69,4 +70,3 @@ do_stage() {
install -d ${CROSS_DATADIR}/qt4
cp -PfR mkspecs ${CROSS_DATADIR}/qt4/
}
-