diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-13 12:32:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 12:45:02 +0200 |
| commit | 1a470256e1e35fb48e4b984f01a1f2db340cd588 (patch) | |
| tree | 4f7dd054ce845e53b8372983825d53ff85df4355 /qmake | |
| parent | 8fa9249acc37ea8ae41a25bbb7444560663985f7 (diff) | |
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 6e0f41f479..b3cf598ddc 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -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) |