diff options
Diffstat (limited to 'qmake/generators/mac')
| -rw-r--r-- | qmake/generators/mac/metrowerks_xml.cpp | 8 | ||||
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp index 34bf35070..5b8802a0a 100644 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ b/qmake/generators/mac/metrowerks_xml.cpp @@ -440,8 +440,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) t << "MYDL"; else t << "MEXE"; - } else if(variable == "CODEWARRIOR_QTDIR") { - t << getenv("QTDIR"); + } else if(variable == "CODEWARRIOR_TQTDIR") { + t << getenv("TQTDIR"); } else if(variable == "CODEWARRIOR_CACHEMODDATES") { t << "true"; } else { @@ -580,7 +580,7 @@ MetrowerksMakefileGenerator::init() } if(project->isActiveConfig("qt")) - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"]; + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; if(project->isEmpty("FRAMEWORKPATH")) project->variables()["FRAMEWORKPATH"].append("/System/Library/Frameworks/"); @@ -612,7 +612,7 @@ MetrowerksMakefileGenerator::findTemplate(const TQString &file) TQString ret; if(!TQFile::exists(ret = file) && !TQFile::exists((ret = Option::mkfile::qmakespec + TQDir::separator() + file)) && - !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/mac-mwerks/" + file)) && + !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/mac-mwerks/" + file)) && !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file)))) return ""; return ret; diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 4f0945029..329b79967 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -356,7 +356,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQTextStream mkt(&mkf); writeHeader(mkt); mkt << "QMAKE = " << - (project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/tqmake") : + (project->isEmpty("QMAKE_QMAKE") ? TQString("$(TQTDIR)/bin/tqmake") : var("QMAKE_QMAKE")) << endl; writeMakeQmake(mkt); mkf.close(); |