| author | kergoth <kergoth> | 2002-11-05 16:40:27 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-05 16:40:27 (UTC) |
| commit | cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 (patch) (side-by-side diff) | |
| tree | d350f2f3138707f3f701444a0e72218b744c5df2 | |
| parent | d590a056fde3eb4ad37ecd202ea024a9ad110106 (diff) | |
| download | opie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.zip opie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.tar.gz opie-cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68.tar.bz2 | |
er, it was prioritizing QMAKESPECSDIR above QMAKESPEC.. fixed
| -rw-r--r-- | qmake/project.cpp | 2 |
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 @@ -439,25 +439,25 @@ QMakeProject::read(QString project, QString) } } /* 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; |