summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-10-13 11:58:38 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-10-13 12:00:43 (GMT)
commite3edb0f6f10d8ae25dad3e4dfe0026313dab8f39 (patch)
tree14274a646dc2a177b5efdd8ee94926a60900bc37 /qmake/generators
parentca75d9d8746856fa0d07629b0154eb901dfbcf4d (diff)
downloadQt-e3edb0f6f10d8ae25dad3e4dfe0026313dab8f39.zip
Qt-e3edb0f6f10d8ae25dad3e4dfe0026313dab8f39.tar.gz
Qt-e3edb0f6f10d8ae25dad3e4dfe0026313dab8f39.tar.bz2
Revert "qmake: pass include directories to MS resource compiler"
This reverts commit cd4eaa9c8274559aa2b0ceaeed1644966b9a2d94. We need a better plan to handle the command-line-is-too-long case. 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, 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;
}
}