From cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 11 Oct 2010 17:00:35 +0200 Subject: qmake: pass include directories to MS resource compiler Task-number: QTBUG-13776 Reviewed-by: ossi --- qmake/generators/win32/msvc_vcproj.cpp | 1 + qmake/generators/win32/msvc_vcxproj.cpp | 1 + qmake/generators/win32/winmakefile.cpp | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index cff7a14..cd42d4d 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1004,6 +1004,7 @@ 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 396d2bf..00702ae 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -365,6 +365,7 @@ 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 ecb20c7..8f148ad 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -760,7 +760,8 @@ 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) -fo " << res_file << " " << rc_file; + << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "") + << " $(DEFINES) $(INCPATH) -fo " << res_file << " " << rc_file; t << endl << endl; } } -- cgit v0.12