diff options
| author | Michele Calgaro <[email protected]> | 2018-09-27 16:03:48 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-27 16:03:48 +0900 |
| commit | 3e98ce7f85f06e95ad121c6f541d14464d85919e (patch) | |
| tree | f02992c00911ec6ba24f243aebf96d98fa0d39a1 /qmake/generators/makefile.cpp | |
| parent | 9f5d59f33644aaadd7af43db86734a3294250a02 (diff) | |
| download | tqt3-3e98ce7f85f06e95ad121c6f541d14464d85919e.tar.gz tqt3-3e98ce7f85f06e95ad121c6f541d14464d85919e.zip | |
qt -> tqt conversion:
QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB
Signed-off-by: Michele Calgaro <[email protected]>
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; } } |