remove support for {rvct,arm,ti}_linker

rvct and armcc support are remnants from symbian, while the ti linker
support was never completed in the first place.

Change-Id: I5c9d7f0ce67de24c348cbee4af618a499fe06f16
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

qmake/generators/unix/unixmake.cpp

@@ -111,11 +111,6 @@ UnixMakefileGenerator::init()
         project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_PREBIND");
     if(!project->isEmpty("QMAKE_INCDIR"))
         project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR");
-    project->values("QMAKE_L_FLAG")
-            << (project->isActiveConfig("rvct_linker") ? "--userlibpath "
-              : project->isActiveConfig("armcc_linker") ? "-L--userlibpath="
-              : project->isActiveConfig("ti_linker") ? "--search_path="
-              : "-L");
     ProStringList ldadd;
     if(!project->isEmpty("QMAKE_LIBDIR")) {
         const ProStringList &libdirs = project->values("QMAKE_LIBDIR");
@@ -437,9 +432,6 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
 bool
 UnixMakefileGenerator::findLibraries()
 {
-    ProString libArg = project->first("QMAKE_L_FLAG");
-    if (libArg == "-L")
-        libArg.clear();
     QList<QMakeLocalFileName> libdirs;
     int libidx = 0;
     foreach (const ProString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
@@ -459,16 +451,8 @@ UnixMakefileGenerator::findLibraries()
                         continue;
                     }
                     libdirs.insert(libidx++, f);
-                    if (!libArg.isEmpty())
-                        *it = libArg + f.real();
                 } else if(opt.startsWith("-l")) {
-                    if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) {
-                        (*it) = "lib" + opt.mid(2) + ".so";
-                    } else if (project->isActiveConfig("ti_linker")) {
-                        (*it) = opt.mid(2);
-                    } else {
                     stub = opt.mid(2);
-                    }
                 } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) {
                     if (opt.length() == 10)
                         ++it;
@@ -544,7 +528,6 @@ QString linkLib(const QString &file, const QString &libName) {
 void
 UnixMakefileGenerator::processPrlFiles()
 {
-    const QString libArg = project->first("QMAKE_L_FLAG").toQString();
     QList<QMakeLocalFileName> libdirs, frameworkdirs;
     int libidx = 0, fwidx = 0;
     foreach (const ProString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
@@ -557,8 +540,8 @@ UnixMakefileGenerator::processPrlFiles()
         for(int lit = 0; lit < l.size(); ++lit) {
             QString opt = l.at(lit).toQString();
             if(opt.startsWith("-")) {
-                if (opt.startsWith(libArg)) {
+                if (opt.startsWith("-L")) {
-                    QMakeLocalFileName l(opt.mid(libArg.length()));
+                    QMakeLocalFileName l(opt.mid(2));
                     if(!libdirs.contains(l))
                        libdirs.insert(libidx++, l);
                 } else if(opt.startsWith("-l")) {
@@ -632,7 +615,7 @@ UnixMakefileGenerator::processPrlFiles()
                         }
                     }
 
-                    if (opt.startsWith(libArg) ||
+                    if (opt.startsWith("-L") ||
                        (target_mode == TARG_MAC_MODE && opt.startsWith("-F"))) {
                         if(!lflags[arch].contains(opt))
                             lflags[arch].append(opt);

qmake/generators/win32/mingw_make.cpp

@@ -183,25 +183,6 @@ void createArObjectScriptFile(const QString &fileName, const QString &target, co
     }
 }
 
-void createRvctObjectScriptFile(const QString &fileName, const ProStringList &objList)
-{
-    QString filePath = Option::output_dir + QDir::separator() + fileName;
-    QFile file(filePath);
-    if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        QTextStream t(&file);
-        for (ProStringList::ConstIterator it = objList.constBegin(); it != objList.constEnd(); ++it) {
-            QString path = (*it).toQString();
-            // ### quoting?
-            if (QDir::isRelativePath(path))
-                t << "./" << path << endl;
-            else
-                t << path << endl;
-        }
-        t.flush();
-        file.close();
-    }
-}
-
 void MingwMakefileGenerator::writeMingwParts(QTextStream &t)
 {
     writeStandardParts(t);
@@ -335,33 +316,20 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)
             ar_script_file += "." + var("BUILD_NAME");
         }
         // QMAKE_LIB is used for win32, including mingw, whereas QMAKE_AR is used on Unix.
-        if (project->isActiveConfig("rvct_linker")) {
-            createRvctObjectScriptFile(ar_script_file, project->values("OBJECTS"));
-            QString ar_cmd = project->values("QMAKE_LIB").join(' ');
-            if (ar_cmd.isEmpty())
-                ar_cmd = "armar --create";
-            objectsLinkLine = ar_cmd + ' ' + fileVar("DEST_TARGET") + " --via " + escapeFilePath(ar_script_file);
-        } else {
         // Strip off any options since the ar commands will be read from file.
-            QString ar_cmd = var("QMAKE_LIB").section(" ", 0, 0);;
+        QString ar_cmd = var("QMAKE_LIB").section(" ", 0, 0);
         if (ar_cmd.isEmpty())
             ar_cmd = "ar";
         createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS"));
         objectsLinkLine = ar_cmd + " -M < " + escapeFilePath(ar_script_file);
-        }
     } else {
         QString ld_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET");
         if (!var("BUILD_NAME").isEmpty()) {
             ld_script_file += "." + var("BUILD_NAME");
         }
-        if (project->isActiveConfig("rvct_linker")) {
-            createRvctObjectScriptFile(ld_script_file, project->values("OBJECTS"));
-            objectsLinkLine = QString::fromLatin1("--via ") + escapeFilePath(ld_script_file);
-        } else {
         createLdObjectScriptFile(ld_script_file, project->values("OBJECTS"));
         objectsLinkLine = escapeFilePath(ld_script_file);
     }
-    }
     Win32MakefileGenerator::writeObjectsPart(t);
 }