diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
| commit | 3d6056dfe01116e34a2b47a70fb95e73753ef766 (patch) | |
| tree | ee4e1430dc9f0b06ab89091682d5a60525eac560 /qmake/generators/win32/winmakefile.cpp | |
| parent | 52e469a629d32b7f7e52518874dab13fcd4bb814 (diff) | |
| parent | 69689f3527f373618a1f4adad543b60afea46c17 (diff) | |
| download | Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.zip Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.gz Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index e3923c6..3a4329c 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -708,7 +708,7 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) if(!project->values("QMAKE_LIBDIR").isEmpty()) writeLibDirPart(t); t << var("QMAKE_LFLAGS") << endl; - t << "LIBS = " << var("QMAKE_LIBS") << endl; + t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; } } |