Revert "move finding the makespec to Option"

Needed for an upcoming revert.
This reverts commit 74a6669fa7c0d6e2cb7d34d56332d620d2a07755.

Conflicts:

	qmake/option.cpp
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I56088506d27bf1f095f9261c75224f4bee17ec60
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 0 insertions, 46 deletions

diff --git a/qmake/option.cpp b/qmake/option.cpp
index b2a1e6982f..3ddde2a11a 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -583,49 +583,6 @@ void Option::applyHostMode()
    }
 }
 
-QStringList Option::mkspecPaths()
-{
-    QStringList ret;
-    const QString concat = QLatin1String("/mkspecs");
-
-    QByteArray qmakepath = qgetenv("QMAKEPATH");
-    if (!qmakepath.isEmpty()) {
-        const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath));
-        for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
-            ret << ((*it) + concat);
-    }
-    if (!Option::mkfile::project_build_root.isEmpty())
-        ret << Option::mkfile::project_build_root + concat;
-    if (!Option::mkfile::project_root.isEmpty())
-        ret << Option::mkfile::project_root + concat;
-    ret << QLibraryInfo::location(QLibraryInfo::HostDataPath) + concat;
-    ret.removeDuplicates();
-    return ret;
-}
-
-bool Option::resolveSpec(QString *spec)
-{
-    QString qmakespec = fixEnvVariables(*spec);
-    if (qmakespec.isEmpty())
-        qmakespec = "default";
-    if (QDir::isRelativePath(qmakespec)) {
-        QStringList mkspec_roots = mkspecPaths();
-        debug_msg(2, "Looking for mkspec %s in (%s)", qmakespec.toLatin1().constData(),
-                  mkspec_roots.join("::").toLatin1().constData());
-        for (QStringList::ConstIterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
-            QString mkspec = (*it) + QLatin1Char('/') + qmakespec;
-            if (QFile::exists(mkspec)) {
-                *spec = mkspec;
-                return true;
-            }
-        }
-        fprintf(stderr, "Could not find mkspecs for your QMAKESPEC(%s) after trying:\n\t%s\n",
-                qmakespec.toLatin1().constData(), mkspec_roots.join("\n\t").toLatin1().constData());
-            return false;
-    }
-    return true;
-}
-
 bool Option::prepareProject(const QString &pfile)
 {
     mkfile::project_build_root.clear();
@@ -679,9 +636,6 @@ bool Option::prepareProject(const QString &pfile)
         mkfile::project_root.clear();
     }
 
-    if (!resolveSpec(&Option::mkfile::qmakespec))
-        return false;
-
     return true;
 }