| author | kergoth <kergoth> | 2002-11-05 16:40:27 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-05 16:40:27 (UTC) |
| commit | cf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 (patch) (unidiff) | |
| tree | d350f2f3138707f3f701444a0e72218b744c5df2 /qmake | |
| 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 | |||
| @@ -445,13 +445,13 @@ QMakeProject::read(QString project, QString) | |||
| 445 | 445 | ||
| 446 | if (getenv("QTDIR")) { | 446 | if (getenv("QTDIR")) { |
| 447 | mkspec_roots << getenv("QTDIR"); | 447 | mkspec_roots << getenv("QTDIR"); |
| 448 | } | 448 | } |
| 449 | mkspec_roots << qInstallPathData(); | 449 | mkspec_roots << qInstallPathData(); |
| 450 | 450 | ||
| 451 | if (getenv("QMAKESPECSDIR")){ | 451 | if (Option::mkfile::qmakespec.isEmpty() && getenv("QMAKESPECSDIR")){ |
| 452 | QString mkspec = QString(getenv("QMAKESPECSDIR")) + QDir::separator() + | 452 | QString mkspec = QString(getenv("QMAKESPECSDIR")) + QDir::separator() + |
| 453 | QDir::separator() + "default"; | 453 | QDir::separator() + "default"; |
| 454 | if(QFile::exists(mkspec)) | 454 | if(QFile::exists(mkspec)) |
| 455 | Option::mkfile::qmakespec = mkspec; | 455 | Option::mkfile::qmakespec = mkspec; |
| 456 | } | 456 | } |
| 457 | 457 | ||