diff options
author | Mark Brand <mabrand@mabrand.nl> | 2011-04-05 08:35:58 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-05 08:35:58 (GMT) |
commit | 63ea4ba0ceb8f625da48ddbe31f96b2148f62146 (patch) | |
tree | 6918e240f88470f320f2bfbffe7c808d103ba317 | |
parent | b40d04a19f4c186bf47aad128b0618c629629e07 (diff) | |
download | Qt-63ea4ba0ceb8f625da48ddbe31f96b2148f62146.zip Qt-63ea4ba0ceb8f625da48ddbe31f96b2148f62146.tar.gz Qt-63ea4ba0ceb8f625da48ddbe31f96b2148f62146.tar.bz2 |
win32-g++: Correct the order of linked Windows libraries
Commit a6d48ca corrected the problem for win32-g++. Here we do the same
for win32-g++-cross.
Merge-request: 1173
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 210ee97..01e2f10 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -65,7 +65,7 @@ QMAKE_LINK_OBJECT_SCRIPT= object_script 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 |