summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 16:40:27 (UTC)
committer kergoth <kergoth>2002-11-05 16:40:27 (UTC)
commitcf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 (patch) (unidiff)
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
@@ -435,33 +435,33 @@ QMakeProject::read(QString project, QString)
435 if(!Option::mkfile::cachefile.isEmpty()) { 435 if(!Option::mkfile::cachefile.isEmpty()) {
436 read(Option::mkfile::cachefile, cache); 436 read(Option::mkfile::cachefile, cache);
437 if(Option::mkfile::qmakespec.isEmpty() && !cache["QMAKESPEC"].isEmpty()) 437 if(Option::mkfile::qmakespec.isEmpty() && !cache["QMAKESPEC"].isEmpty())
438 Option::mkfile::qmakespec = cache["QMAKESPEC"].first(); 438 Option::mkfile::qmakespec = cache["QMAKESPEC"].first();
439 } 439 }
440 } 440 }
441 /* parse mkspec */ 441 /* parse mkspec */
442 QStringList mkspec_roots; 442 QStringList mkspec_roots;
443 /* prefer $QTDIR if it is set */ 443 /* prefer $QTDIR if it is set */
444 /* prefer QMAKESPECSDIR -cl */ 444 /* prefer QMAKESPECSDIR -cl */
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
458 if(Option::mkfile::qmakespec.isEmpty()) { 458 if(Option::mkfile::qmakespec.isEmpty()) {
459 for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) { 459 for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
460 QString mkspec = (*it) + QDir::separator() + QString("mkspecs") + 460 QString mkspec = (*it) + QDir::separator() + QString("mkspecs") +
461 QDir::separator() + "default"; 461 QDir::separator() + "default";
462 if(QFile::exists(mkspec)) { 462 if(QFile::exists(mkspec)) {
463 Option::mkfile::qmakespec = mkspec; 463 Option::mkfile::qmakespec = mkspec;
464 break; 464 break;
465 } 465 }
466 } 466 }
467 } 467 }