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/win32/mingw_make.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/win32/mingw_make.cpp')
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 3c4c33c61..2a3ab3e02 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -491,8 +491,8 @@ MingwMakefileGenerator::init() if ( project->isActiveConfig("qt") ) { project->variables()["CONFIG"].append("moc"); - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"]; - project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"]; + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; + project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"]; if ( !project->isActiveConfig("debug") ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { @@ -507,9 +507,9 @@ MingwMakefileGenerator::init() else project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { - int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt"); if ( hver == -1 ) - hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "tqt-mt"); + hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "tqt-mt"); if(hver != -1) { TQString ver; ver.sprintf("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver); |