summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 16:40:27 (UTC)
committer kergoth <kergoth>2002-11-05 16:40:27 (UTC)
commitcf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 (patch) (side-by-side diff)
treed350f2f3138707f3f701444a0e72218b744c5df2
parentd590a056fde3eb4ad37ecd202ea024a9ad110106 (diff)
downloadopie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.zip
opie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.tar.gz
opie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.tar.bz2
er, it was prioritizing QMAKESPECSDIR above QMAKESPEC.. fixed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/project.cpp2
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
@@ -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))