diff options
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index b294e1c38..40034ace5 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -468,8 +468,8 @@ void VcprojGenerator::init() if ( isTQtActive ) { project->variables()["CONFIG"] += "moc"; project->variables()["CONFIG"] += "windows"; - 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( projectTarget == SharedLib ) project->variables()["DEFINES"] += "QT_DLL"; @@ -1150,8 +1150,8 @@ void VcprojGenerator::initOld() // QT ------------------------------------------------------------ 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 ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { @@ -1164,9 +1164,9 @@ void VcprojGenerator::initOld() 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) { @@ -1376,8 +1376,8 @@ void VcprojGenerator::initOld() project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET"); Option::fixPathToTargetOS(project->first("TARGET")); dest = project->first("TARGET") + project->first( "TARGET_EXT" ); - if ( project->first("TARGET").startsWith("$(QTDIR)") ) - dest.replace( TQRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") ); + if ( project->first("TARGET").startsWith("$(TQTDIR)") ) + dest.replace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") ); project->variables()["MSVCPROJ_TARGET"] = dest; // DLL COPY ------------------------------------------------------ @@ -1509,7 +1509,7 @@ TQString VcprojGenerator::findTemplate(TQString file) TQString ret; if(!TQFile::exists((ret = file)) && !TQFile::exists((ret = TQString(Option::mkfile::qmakespec + "/" + file))) && - !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) && + !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/win32-msvc.net/" + file)) && !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file)))) return ""; debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() ); |