diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 16:09:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 16:09:30 (GMT) |
| commit | c94ac2ab18564f80e6e50747981a676498ec2be1 (patch) | |
| tree | 0b8728d43e4d76a5575bbddc85ab4e1c61a331ad /mkspecs | |
| parent | 22f285ac93bde36d0d965f72cd56b6173e88c6e2 (diff) | |
| parent | a6d48ca57403539ab8e00d16f80bd4cd334e1b5c (diff) | |
| download | Qt-c94ac2ab18564f80e6e50747981a676498ec2be1.zip Qt-c94ac2ab18564f80e6e50747981a676498ec2be1.tar.gz Qt-c94ac2ab18564f80e6e50747981a676498ec2be1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
win32-g++: Correct the order of linked Windows libraries
Fixing a traling space on if statement that fails in Solaris.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
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 |