summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-07 06:56:19 (GMT)
committeraxis <qt-info@nokia.com>2011-01-28 12:25:03 (GMT)
commit5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1 (patch)
tree613c55ced101e2093b85462b577ac93dfc4918e2
parentb93fc7fabd289c99124bf68898605591d6d9b283 (diff)
downloadQt-5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1.zip
Qt-5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1.tar.gz
Qt-5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1.tar.bz2
Added support for rvct_linker config in qmake's MinGW generator.
RevBy: Trust me
-rw-r--r--qmake/generators/win32/mingw_make.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 8450eaf..648776d 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -368,17 +368,25 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
t << "LIBS = ";
if(!project->values("QMAKE_LIBDIR").isEmpty())
writeLibDirPart(t);
- t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' '
- << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
+ if (project->isActiveConfig("rvct_linker")) {
+ t << var("QMAKE_LIBS") << ' '
+ << var("QMAKE_LIBS_PRIVATE") << endl;
+ } else {
+ t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' '
+ << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
+ }
}
}
void MingwMakefileGenerator::writeLibDirPart(QTextStream &t)
{
QStringList libDirs = project->values("QMAKE_LIBDIR");
+ QString libArg = QString::fromLatin1("-L");
+ if (project->isActiveConfig("rvct_linker"))
+ libArg = QString::fromLatin1("--userlibpath ");
for (int i = 0; i < libDirs.size(); ++i)
libDirs[i].remove("\"");
- t << valGlue(libDirs,"-L"+quote,quote+" -L" +quote,quote) << " ";
+ t << valGlue(libDirs, libArg+quote, quote+" "+libArg+quote, quote) << " ";
}
void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)