summaryrefslogtreecommitdiff
path: root/qmake
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-28 10:28:23 +0100
committeraxis <qt-info@nokia.com>2011-03-04 11:44:40 +0100
commit7a53c676479c5531880793f79f0fb2e74b31fae1 (patch)
treeb1f1356d4b31962d13baacddee0abe4c09a29b38 /qmake
parent728f0f7d5c1c84ca713cfb34c3d32b65018028d4 (diff)
downloadqt4-tools-7a53c676479c5531880793f79f0fb2e74b31fae1.tar.gz
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')
-rw-r--r--qmake/generators/win32/mingw_make.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 9eea98ffb8..60640809e3 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) << " ";
}