[mingw32-qt-qmake] Keep on using the native Qt tools until the new mingw-qt package is ready

[epienbro]

commit 5f34f83315f24e53014f5191c014c1ae9b86f4a1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Feb 28 14:25:31 2012 +0100

    Keep on using the native Qt tools until the new mingw-qt package is ready

 mingw32-qt-qmake.spec |    5 ++++-
 qmake.conf            |   10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/mingw32-qt-qmake.spec b/mingw32-qt-qmake.spec
index d06d377..78d7c53 100644
--- a/mingw32-qt-qmake.spec
+++ b/mingw32-qt-qmake.spec
@@ -13,7 +13,7 @@
 
 Name:           mingw32-qt-qmake
 Version:        4.8.0
-Release:        3%{?pre}%{?dist}
+Release:        4%{?pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -65,6 +65,9 @@ cp %{SOURCE0} %{SOURCE1} \
 
 
 %changelog
+* Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-4
+- Keep on using the native Qt tools until the new mingw-qt package is ready
+
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-3
 - Rebuild against the mingw-w64 toolchain
 - Made the qmake.conf compatible with mingw-w64
diff --git a/qmake.conf b/qmake.conf
index a57d649..e041657 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -94,11 +94,11 @@ QMAKE_INSTALL_PROGRAM = install -m 755 -p
 QMAKE_CHK_DIR_EXISTS  = mkdir -p
 QMAKE_MKDIR           = 
 
-PKG_CONFIG		= i686-w64-mingw32-pkg-config
-QMAKE_LRELEASE		= i686-w64-mingw32-lrelease
-QMAKE_MOC		= i686-w64-mingw32-moc
-QMAKE_UIC		= i686-w64-mingw32-uic
-QMAKE_RCC		= i686-w64-mingw32-rcc
+QMAKE_MOC		= moc-qt4
+QMAKE_UIC		= uic-qt4
+QMAKE_IDC		= idc
+
+QMAKE_RCC		= $$[QT_INSTALL_BINS]/rcc
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= i686-w64-mingw32-ar -ru