[mingw-qt: 62/65] Made the qmake.conf compatible with mingw-w64

[epienbro]

commit 3a53f41d99e6df31186396eabc5d382fb0d28e0e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Feb 28 01:15:22 2012 +0100

    Made the qmake.conf compatible with mingw-w64

 mingw32-qt.spec |    1 +
 qmake.conf      |   30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 1c72ce2..a764482 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -325,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 %changelog
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-5
 - Rebuild against the mingw-w64 toolchain
+- Made the qmake.conf compatible with mingw-w64
 
 * Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-4
 - Replaced the pkg-config environment hacks with a proper fix
diff --git a/qmake.conf b/qmake.conf
index 11a3b9e..0f2a0ec 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -16,12 +16,12 @@ QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
 QMAKE_EXT_OBJ           = .o
 QMAKE_EXT_RES           = _res.o
 
-QMAKE_CC		= i686-pc-mingw32-gcc
+QMAKE_CC		= i686-w64-mingw32-gcc
 QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		=
 QMAKE_YACC		= byacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -mms-bitfields
+QMAKE_CFLAGS		= -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -fno-keep-inline-dllexport
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall
 QMAKE_CFLAGS_WARN_OFF	= -w
@@ -29,7 +29,7 @@ QMAKE_CFLAGS_RELEASE	= -O2
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
-QMAKE_CXX		= i686-pc-mingw32-g++
+QMAKE_CXX		= i686-w64-mingw32-g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
@@ -45,16 +45,16 @@ QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 
 QMAKE_INCDIR		=
 #QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_INCDIR_QT         = /usr/i686-pc-mingw32/sys-root/mingw/include
+QMAKE_INCDIR_QT         = /usr/i686-w64-mingw32/sys-root/mingw/include
 #QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-QMAKE_LIBDIR_QT         = /usr/i686-pc-mingw32/sys-root/mingw/lib
+QMAKE_LIBDIR_QT         = /usr/i686-w64-mingw32/sys-root/mingw/lib
 
 QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
 QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 
-QMAKE_LINK		= i686-pc-mingw32-g++
+QMAKE_LINK		= i686-w64-mingw32-g++
 QMAKE_LFLAGS		= 
 QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 QMAKE_LFLAGS_EXCEPTIONS_OFF =
@@ -78,6 +78,7 @@ QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2
 QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 
 QMAKE_DIR_SEP         = /
+QMAKE_STREAM_EDITOR   = sed
 QMAKE_COPY            = cp -f
 QMAKE_COPY_FILE       = $(COPY)
 QMAKE_COPY_DIR        = $(COPY) -a
@@ -93,19 +94,18 @@ QMAKE_INSTALL_PROGRAM = install -m 755 -p
 QMAKE_CHK_DIR_EXISTS  = mkdir -p
 QMAKE_MKDIR           = 
 
-PKG_CONFIG		= i686-pc-mingw32-pkg-config
-QMAKE_MOC		= moc-qt4
-QMAKE_UIC		= uic-qt4
-QMAKE_IDC		= idc
-
-QMAKE_RCC		= $$[QT_INSTALL_BINS]/rcc
+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_IDL		= midl
-QMAKE_LIB		= i686-pc-mingw32-ar -ru
-QMAKE_RC		= i686-pc-mingw32-windres
+QMAKE_LIB		= i686-w64-mingw32-ar -ru
+QMAKE_RC		= i686-w64-mingw32-windres
 QMAKE_ZIP		= zip -r -9
 
-QMAKE_STRIP		= i686-pc-mingw32-strip
+QMAKE_STRIP		= i686-w64-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 
 load(qt_config)