Make qmake obey QMAKESPECSDIR if set.

1 files changed, 15 insertions, 8 deletions

diff --git a/qmake/project.cpp b/qmake/project.cpp
index ae24193..96cdad8 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -420,69 +420,76 @@ QMakeProject::read(QString project, QString)
             if(Option::mkfile::cachefile.isEmpty())  { //find it as it has not been specified
                 QString dir = QDir::convertSeparators(Option::output_dir);
                 while(!QFile::exists((Option::mkfile::cachefile = dir +
                                       QDir::separator() + ".qmake.cache"))) {
                     dir = dir.left(dir.findRev(QDir::separator()));
                     if(dir.isEmpty() || dir.find(QDir::separator()) == -1) {
                         Option::mkfile::cachefile = "";
                         break;
                     }
                     if(Option::mkfile::cachefile_depth == -1)
                         Option::mkfile::cachefile_depth = 1;
                     else
                         Option::mkfile::cachefile_depth++;
                 }
             }
             if(!Option::mkfile::cachefile.isEmpty()) {
                 read(Option::mkfile::cachefile, cache);
                 if(Option::mkfile::qmakespec.isEmpty() && !cache["QMAKESPEC"].isEmpty())
                     Option::mkfile::qmakespec = cache["QMAKESPEC"].first();
             }
         }
         /* parse mkspec */
         QStringList mkspec_roots;
         /* prefer $QTDIR if it is set */
-        /* minor hack here, prefer QMAKESPECDIR -cl */
+        /* prefer QMAKESPECSDIR -cl */
         
-        if (getenv("QMAKESPECDIR")){
-            mkspec_roots << getenv("QMAKESPECDIR");
-        } else if (getenv("QTDIR")) {
+        if (getenv("QTDIR")) {
             mkspec_roots << getenv("QTDIR");
         }
         mkspec_roots << qInstallPathData();
+
+        if (getenv("QMAKESPECSDIR")){
+                QString mkspec = QString(getenv("QMAKESPECSDIR")) + QDir::separator() +
+                                 QDir::separator() + "default";
+                if(QFile::exists(mkspec))
+                    Option::mkfile::qmakespec = mkspec;
+        }
+
         if(Option::mkfile::qmakespec.isEmpty()) {
             for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
                 QString mkspec = (*it) + QDir::separator() + QString("mkspecs") +
                                  QDir::separator() + "default";
                 if(QFile::exists(mkspec)) {
                     Option::mkfile::qmakespec = mkspec;
                     break;
                 }
             }
-            if(Option::mkfile::qmakespec.isEmpty()) {
-                fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n");
-                return FALSE;
-            }
+        }
+
+        if(Option::mkfile::qmakespec.isEmpty()) {
+            fprintf(stderr, "QMAKESPEC has not been set, so configuration cannot be deduced.\n");
+            return FALSE;
         }
 
         if(QDir::isRelativePath(Option::mkfile::qmakespec)) {
             bool found_mkspec = FALSE;
             for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
                 QString mkspec = (*it) + QDir::separator() + QString("mkspecs") +
                                  QDir::separator() + Option::mkfile::qmakespec;
                 if(QFile::exists(mkspec)) {
                     found_mkspec = TRUE;
                     Option::mkfile::qmakespec = mkspec;
                     break;
                 }
             }
             if(!found_mkspec) {
                 fprintf(stderr, "Could not find mkspecs for your QMAKESPEC after trying:\n\t%s\n",
                         mkspec_roots.join("\n\t").latin1());
                 return FALSE;
             }
         }
 
         /* parse qmake configuration */
         QString spec = Option::mkfile::qmakespec + QDir::separator() + "qmake.conf";
         debug_msg(1, "QMAKESPEC conf: reading %s", spec.latin1());
         if(!read(spec, base_vars)) {