diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
| commit | 42318a57e95a875b2168ca027679d9258fcc929b (patch) | |
| tree | 88217a1a9df26fc0ec7f4af83607c727c9944b38 /mkspecs/win32-msvc2003/qmake.conf | |
| parent | 09f07b98dfdaec2e48749768b967a48e588d3f7f (diff) | |
| parent | 739d4460d28d0ebcde4e5960f533c2a7554049f6 (diff) | |
| download | Qt-42318a57e95a875b2168ca027679d9258fcc929b.zip Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.gz Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'mkspecs/win32-msvc2003/qmake.conf')
| -rw-r--r-- | mkspecs/win32-msvc2003/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf index 5344331..0230b30 100644 --- a/mkspecs/win32-msvc2003/qmake.conf +++ b/mkspecs/win32-msvc2003/qmake.conf @@ -59,7 +59,7 @@ QMAKE_LFLAGS_DLL = /DLL QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ws2_32.lib ole32.lib user32.lib advapi32.lib QMAKE_LIBS_NETWORK = ws2_32.lib -QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib +QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain |