summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-10-11 15:00:35 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-10-11 16:41:06 (GMT)
commitcd4eaa9c8274559aa2b0ceaeed1644966b9a2d94 (patch)
tree3319ee5d9cbbc9bf395dc65f2009e57115170c3a /qmake/generators
parent89a853370d94373c6ef1c9fabcfb5bf19c20f7c9 (diff)
downloadQt-cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94.zip
Qt-cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94.tar.gz
Qt-cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94.tar.bz2
qmake: pass include directories to MS resource compiler
Task-number: QTBUG-13776 Reviewed-by: ossi
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp1
-rw-r--r--qmake/generators/win32/msvc_vcxproj.cpp1
-rw-r--r--qmake/generators/win32/winmakefile.cpp3
3 files changed, 4 insertions, 1 deletions
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;
}
}