[mingw32-qt-qmake] Update to 4.7.4

[epienbro]

commit d55186b83f86374971a8c1aa8edcbf17ab3bd8af
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Sep 4 18:05:20 2011 +0200

    Update to 4.7.4

 mingw32-qt-qmake.spec |    5 ++++-
 qmake.conf            |   11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-qt-qmake.spec b/mingw32-qt-qmake.spec
index db07b81..811f198 100644
--- a/mingw32-qt-qmake.spec
+++ b/mingw32-qt-qmake.spec
@@ -12,7 +12,7 @@
 %global compatplatform fedora-win32-cross
 
 Name:           mingw32-qt-qmake
-Version:        4.7.3
+Version:        4.7.4
 Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep  3 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+
 * Sun Aug 28 2011 Kalev Lember <kalevlember at gmail.com> - 4.7.3-1
 - Update to 4.7.3
 
diff --git a/qmake.conf b/qmake.conf
index f234788..8cce4ec 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -55,20 +55,22 @@ 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_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
+QMAKE_LFLAGS		= 
+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
 QMAKE_LFLAGS_EXCEPTIONS_OFF =
 QMAKE_LFLAGS_RELEASE	= -Wl,-s
-QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_DEBUG	= -g
 QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
 QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
 QMAKE_LFLAGS_DLL        = -shared
 QMAKE_LINK_OBJECT_MAX	= 10
 QMAKE_LINK_OBJECT_SCRIPT= object_script
+QMAKE_PREFIX_STATICLIB  = lib
+QMAKE_EXTENSION_STATICLIB = a
 
 
 QMAKE_LIBS		=
-QMAKE_LIBS_CORE         = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
+QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
 QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
 QMAKE_LIBS_NETWORK      = -lws2_32
 QMAKE_LIBS_OPENGL       = -lopengl32 -lglu32 -lgdi32 -luser32
@@ -104,6 +106,7 @@ QMAKE_ZIP		= zip -r -9
 
 QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+
 load(qt_config)
 
 QT_LIBINFIX		= 4