diff options
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index cd42d4d..cff7a14 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1004,7 +1004,6 @@ void VcprojGenerator::initResourceTool() { VCConfiguration &conf = vcProject.Configuration; conf.resource.PreprocessorDefinitions = conf.compiler.PreprocessorDefinitions; - conf.resource.AdditionalIncludeDirectories = conf.compiler.AdditionalIncludeDirectories; // We need to add _DEBUG for the debug version of the project, since the normal compiler defines // do not contain it. (The compiler defines this symbol automatically, which is wy we don't need diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index 00702ae..396d2bf 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -365,7 +365,6 @@ void VcxprojGenerator::initResourceTool() { VCXConfiguration &conf = vcxProject.Configuration; conf.resource.PreprocessorDefinitions = conf.compiler.PreprocessorDefinitions; - conf.resource.AdditionalIncludeDirectories = conf.compiler.AdditionalIncludeDirectories; // We need to add _DEBUG for the debug version of the project, since the normal compiler defines // do not contain it. (The compiler defines this symbol automatically, which is wy we don't need diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 8f148ad..ecb20c7 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -760,8 +760,7 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t) // since the compiler defines this symbol by itself, and we use it in the automatically // created rc file when VERSION is define the .pro file. t << res_file << ": " << rc_file << "\n\t" - << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "") - << " $(DEFINES) $(INCPATH) -fo " << res_file << " " << rc_file; + << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "") << " $(DEFINES) -fo " << res_file << " " << rc_file; t << endl << endl; } } |