diff options
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index f813b4cb4..a9e08a855 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -569,16 +569,16 @@ NmakeMakefileGenerator::init() if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") ) project->variables()["CONFIG"].append("windows"); if ( project->isActiveConfig("qtopiainc") ) - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"]; + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"]; if ( project->isActiveConfig("qtopialib") ) { - if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA")) - project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"]; + if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA")) + project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQTOPIA"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"]; } 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() ) { @@ -592,9 +592,9 @@ NmakeMakefileGenerator::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("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); |