summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2011-04-04 11:01:48 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-04 11:01:56 (GMT)
commita6d48ca57403539ab8e00d16f80bd4cd334e1b5c (patch)
treec1a33a184fb4b110abc58c6475029cd0f223fd70 /mkspecs/win32-g++
parent0170a4dd8a720921e591622188bd1f11d9fe357b (diff)
downloadQt-a6d48ca57403539ab8e00d16f80bd4cd334e1b5c.zip
Qt-a6d48ca57403539ab8e00d16f80bd4cd334e1b5c.tar.gz
Qt-a6d48ca57403539ab8e00d16f80bd4cd334e1b5c.tar.bz2
win32-g++: Correct the order of linked Windows libraries
On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/win32-g++')
-rw-r--r--mkspecs/win32-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 1469abd..220af32 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -67,7 +67,7 @@ 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 = -lglu32 -lopengl32 -lgdi32 -luser32