From cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Tue, 05 Nov 2002 16:40:27 +0000
Subject: er, it was prioritizing QMAKESPECSDIR above QMAKESPEC.. fixed

---
(limited to 'qmake')

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 96cdad8..44eb503 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -448,7 +448,7 @@ QMakeProject::read(QString project, QString)
 	}
 	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))
--
cgit v0.9.0.2