diff options
| author | axis <qt-info@nokia.com> | 2011-01-28 09:28:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-01-28 12:25:23 (GMT) |
| commit | 8a443d2695344f26b9adf4310672e1a5fd62aeb5 (patch) | |
| tree | e2e3825548236b43c01fb30e27cff314f4d4e274 /qmake | |
| parent | 63c02607744fd5431132c6ea4f44380e6e20e12f (diff) | |
| download | Qt-8a443d2695344f26b9adf4310672e1a5fd62aeb5.zip Qt-8a443d2695344f26b9adf4310672e1a5fd62aeb5.tar.gz Qt-8a443d2695344f26b9adf4310672e1a5fd62aeb5.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')
| -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 95795b8..e4082cc 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) << " "; } |