diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0e331cf87..99b10d3e4 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -39,8 +39,8 @@ #include "makefile.h" #include "option.h" #include "meta.h" -#include <ntqdir.h> -#include <ntqfile.h> +#include <tqdir.h> +#include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> #include <tqdict.h> @@ -2231,15 +2231,15 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, TQString orig_file = file; if(!force_fix && project->isActiveConfig("no_fixpath")) { if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) { //absoluteify it - TQString qfile = Option::fixPathToLocalOS(file, TRUE, canon); + TQString tqfile = Option::fixPathToLocalOS(file, TRUE, canon); if(TQDir::isRelativePath(file)) { //already absolute - TQFileInfo fi(qfile); + TQFileInfo fi(tqfile); if(!fi.convertToAbs()) //strange file = fi.filePath(); } } } else { //fix it.. - TQString qfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d); + TQString tqfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d); { if(out_dir.isNull() || TQDir::isRelativePath(out_dir)) out_dir.prepend(Option::output_dir + TQDir::separator()); @@ -2265,8 +2265,8 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, if(!out_canonical_dir.isEmpty()) out_dir = out_canonical_dir; } - if(out_dir != in_dir || !TQDir::isRelativePath(qfile)) { - if(TQDir::isRelativePath(qfile)) { + if(out_dir != in_dir || !TQDir::isRelativePath(tqfile)) { + if(TQDir::isRelativePath(tqfile)) { if(file.left(Option::dir_sep.length()) != Option::dir_sep && in_dir.right(Option::dir_sep.length()) != Option::dir_sep) file.prepend(Option::dir_sep); @@ -2386,16 +2386,16 @@ MakefileGenerator::specdir() spec = Option::mkfile::qmakespec; #if 0 if(const char *d = getenv("TQTDIR")) { - TQString qdir = Option::fixPathToTargetOS(TQString(d)); - if(qdir.endsWith(TQString(TQChar(TQDir::separator())))) - qdir.truncate(qdir.length()-1); + TQString tqdir = Option::fixPathToTargetOS(TQString(d)); + if(tqdir.endsWith(TQString(TQChar(TQDir::separator())))) + tqdir.truncate(tqdir.length()-1); //fix path TQFileInfo fi(spec); TQString absSpec(fi.absFilePath()); absSpec = Option::fixPathToTargetOS(absSpec); //replace what you can - if(absSpec.startsWith(qdir)) { - absSpec.replace(0, qdir.length(), "$(TQTDIR)"); + if(absSpec.startsWith(tqdir)) { + absSpec.replace(0, tqdir.length(), "$(TQTDIR)"); spec = absSpec; } } |