contrib: qt4: use proper cross compile

diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index f03555597e5190f69cd102e36fe3262f7fde6fe7..e221255c77cddd99f68f78ad7aba480801cb073b 100644 (file)
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -22,7 +22,6 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
 
 qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
        $(UNPACK)
-       patch -p0 < $(SRC)/qt4/tools.diff
 ifdef HAVE_WIN32
 ifdef HAVE_WIN64
        patch -p0 < $(SRC)/qt4/cross-win64.diff
@@ -33,8 +32,7 @@ endif
        mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
 
 .qt4: qt4
-       for i in qmake moc uic rcc; do ln -sf `which $$i` $</bin/; done # FIXME : we probably need the exact same version of those tools on the host
-       cd $< && ./configure -platform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
+       cd $< && ./configure -xplatform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
        cd $< && make sub-src
        cd $</src/plugins/imageformats/jpeg && make # FIXME
        # INSTALLING LIBRARIES

diff --git a/contrib/src/qt4/tools.diff b/contrib/src/qt4/tools.diff
deleted file mode 100644 (file)
index b24f480..0000000
--- a/contrib/src/qt4/tools.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- qt-everywhere-opensource-src-4.7.4/configure.orig  2011-09-28 14:31:35.039958884 -0400
-+++ qt-everywhere-opensource-src-4.7.4/configure       2011-09-28 14:31:48.649958702 -0400
-@@ -4568,7 +4568,7 @@
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if [ '!' -f "$outpath/bin/qmake" ]; then
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
---- qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro.orig        2011-09-28 14:33:24.119957315 -0400
-+++ qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro     2011-09-28 14:33:56.619956845 -0400
-@@ -1,11 +1,6 @@
- TEMPLATE = subdirs
- 
--TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
--!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
--!cross_compile {
--    contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
--    win32:!wince*: SRC_SUBDIRS += src_tools_idc
--}
-+TOOLS_SUBDIRS = src_tools_bootstrap 
- 
- # Set subdir and respective target name
- src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap