[mingw-qt: 49/65] Updated the mkspecs file to be compatible with Qt 4.7.4

epienbro epienbro at fedoraproject.org
Tue Mar 6 21:30:52 UTC 2012


commit b11527d994b7f1226961d8d157b35795e1d76ab2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Sep 3 23:27:12 2011 +0200

    Updated the mkspecs file to be compatible with Qt 4.7.4

 qmake.conf |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/qmake.conf b/qmake.conf
index f2f9589..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
@@ -102,8 +104,9 @@ QMAKE_LIB		= i686-pc-mingw32-ar -ru
 QMAKE_RC		= i686-pc-mingw32-windres
 QMAKE_ZIP		= zip -r -9
 
-#QT_LIBINFIX		= 4
-
 QMAKE_STRIP		= i686-pc-mingw32-strip
 QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+
 load(qt_config)
+
+QT_LIBINFIX		= 4


More information about the scm-commits mailing list