diff options
| author | axis <qt-info@nokia.com> | 2011-01-28 09:28:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-04 10:44:40 (GMT) |
| commit | 7a53c676479c5531880793f79f0fb2e74b31fae1 (patch) | |
| tree | b1f1356d4b31962d13baacddee0abe4c09a29b38 /qmake/generators/win32 | |
| parent | 728f0f7d5c1c84ca713cfb34c3d32b65018028d4 (diff) | |
| download | Qt-7a53c676479c5531880793f79f0fb2e74b31fae1.zip Qt-7a53c676479c5531880793f79f0fb2e74b31fae1.tar.gz Qt-7a53c676479c5531880793f79f0fb2e74b31fae1.tar.bz2 | |
Made qmake strip trailing \ from libdirs.
This was done because trailing \ would confuse the command line
parser if the path was also quoted.
RevBy: Oswald Buddenhagen
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 9eea98f..6064080 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -381,8 +381,11 @@ void MingwMakefileGenerator::writeLibDirPart(QTextStream &t) QString libArg = QString::fromLatin1("-L"); if (project->isActiveConfig("rvct_linker")) libArg = QString::fromLatin1("--userlibpath "); - for (int i = 0; i < libDirs.size(); ++i) + for (int i = 0; i < libDirs.size(); ++i) { libDirs[i].remove("\""); + if (libDirs[i].endsWith("\\")) + libDirs[i].chop(1); + } t << valGlue(libDirs, libArg+quote, quote+" "+libArg+quote, quote) << " "; } |