er, it was prioritizing QMAKESPECSDIR above QMAKESPEC.. fixed

1 files changed, 1 insertions, 1 deletions

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 96cdad8..44eb503 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -435,33 +435,33 @@ QMakeProject::read(QString project, QString)
 	    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 */
 	/* prefer QMAKESPECSDIR -cl */
 	
 	if (getenv("QTDIR")) {
 	    mkspec_roots << getenv("QTDIR");
 	}
 	mkspec_roots << qInstallPathData();
 
-	if (getenv("QMAKESPECSDIR")){
+	if (Option::mkfile::qmakespec.isEmpty() && 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;
 		}
 	    }
 	}