diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 13:49:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 13:49:21 (GMT) |
| commit | a74b598cda82e9bddfe3f4613a7acc04f37bdd2d (patch) | |
| tree | c414da00b44beecf23926782ceb988346087b34c /qmake/generators | |
| parent | fe7c8626af168ca29fd74930b9baa16c6dacdc30 (diff) | |
| parent | a5e5f9925e7f945e6b95452662be6981b41adecb (diff) | |
| download | Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.zip Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.tar.gz Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QHostInfo: Forgot to free some stuff on application exit.
Readd a line that got removed by accident in previous change
Ensure that a library path with a space in it gets quoted on Windows
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 9d3b4c6..c36cc9c 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -150,6 +150,10 @@ Win32MakefileGenerator::findLibraries(const QString &where) if(QMakeMetaInfo::libExists((*it).local() + Option::dir_sep + lib) || exists((*it).local() + Option::dir_sep + lib + extension)) { out = (*it).real() + Option::dir_sep + lib + extension; + if (out.contains(QLatin1Char(' '))) { + out.prepend(QLatin1Char('\"')); + out.append(QLatin1Char('\"')); + } break; } } |