diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index fae1dc6c1..c41f8e82f 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1485,8 +1485,8 @@ MakefileGenerator::usePlatformDir() project->variables()["OBJECTS_DIR"] = filePath + (filePath.isEmpty() ? pltDir : slashPltDir); - filePath = project->first("QMAKE_LIBDIR_QT"); - project->variables()["QMAKE_LIBDIR_QT"] = filePath + filePath = project->first("QMAKE_LIBDIR_TQT"); + project->variables()["QMAKE_LIBDIR_TQT"] = filePath + (filePath.isEmpty() ? pltDir : slashPltDir); filePath = project->first("QMAKE_LIBS_QT"); @@ -2393,7 +2393,7 @@ MakefileGenerator::specdir() return spec; spec = Option::mkfile::qmakespec; #if 0 - if(const char *d = getenv("QTDIR")) { + if(const char *d = getenv("TQTDIR")) { TQString qdir = Option::fixPathToTargetOS(TQString(d)); if(qdir.endsWith(TQString(TQChar(TQDir::separator())))) qdir.truncate(qdir.length()-1); @@ -2403,7 +2403,7 @@ MakefileGenerator::specdir() absSpec = Option::fixPathToTargetOS(absSpec); //replace what you can if(absSpec.startsWith(qdir)) { - absSpec.replace(0, qdir.length(), "$(QTDIR)"); + absSpec.replace(0, qdir.length(), "$(TQTDIR)"); spec = absSpec; } } |