diff options
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 40034ace5..999b05f04 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -648,8 +648,8 @@ void VcprojGenerator::initConfiguration() if (!project->variables()["QMAKE_CXXFLAGS_RELEASE"].contains("Gm") && project->variables()["QMAKE_CXXFLAGS_DEBUG"].contains("Gm")) RConf.compiler.parseOption("-Gm-"); - if (RConf.compiler.PreprocessorDefinitions.findIndex("QT_NO_DEBUG") == -1) - RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1) + RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; } else { DConf.IntermediateDirectory = DConf.compiler.AssemblerListingLocation = @@ -659,7 +659,7 @@ void VcprojGenerator::initConfiguration() DConf.linker.DelayLoadDLLs.clear(); DConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_DEBUG"]); DConf.compiler.parseOptions(project->variables()["QMAKE_CXXFLAGS_DEBUG"]); - DConf.compiler.PreprocessorDefinitions.remove("QT_NO_DEBUG"); + DConf.compiler.PreprocessorDefinitions.remove("TQT_NO_DEBUG"); } // Add Debug configuration to project @@ -704,7 +704,7 @@ void VcprojGenerator::initCompilerTool() // Release version RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] ); - RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; RConf.compiler.PreprocessorDefinitions += "NDEBUG"; if ( project->isActiveConfig("thread") ) { if ( (projectTarget == Application) || (projectTarget == StaticLib) ) |