whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove support for rvct_linker config from MinGW generator again 

yet another symbian remnant (building windows arm executables for the
simulator).
This reverts commit 5c88141ed0b25d8ab9318bf4cb5dda54b90b2ce1.

Change-Id: I6eb147c0e2710eba09a4339fa4a08a5b08f8dab3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
bb10
Oswald Buddenhagen 2012-07-13 12:32:45 +02:00 committed by Qt by Nokia
parent 8fa9249acc
commit 1a470256e1
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qmake/generators/win32/mingw_make.cpp
View File

@ -353,28 +353,20 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
t << "LIBS = ";
if(!project->values("QMAKE_LIBDIR").isEmpty())
writeLibDirPart(t);
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;
}
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("\"");
if (libDirs[i].endsWith("\\"))
libDirs[i].chop(1);
}
t << valGlue(libDirs, libArg+quote, quote+" "+libArg+quote, quote) << " ";
t << valGlue(libDirs, "-L" + quote, quote + " -L" + quote, quote) << " ";
}
void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)