diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-06 16:29:30 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 10:17:25 +0100 |
commit | f9ebe26aaedf07421f62e7ac47a944c21b3a7f28 (patch) | |
tree | 7b9c4e5ee619c8a8e01d5aedb8829ea5f1d08ee7 /qmake/generators/win32/msvc_vcproj.cpp | |
parent | e23e22449891b7957a693bfd14a42677a95cef32 (diff) |
support include paths for the Windows resource compiler
In RC_INCLUDEPATH one can add include paths for the Windows resource
compiler.
Task-number: QTBUG-13776
Change-Id: If1d9ed44097adb7789df03e4ccd4e3b7df9e8d08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 1e3f66a9c0..9f14b61f49 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1072,6 +1072,17 @@ void VcprojGenerator::initResourceTool() VCConfiguration &conf = vcProject.Configuration; conf.resource.PreprocessorDefinitions = conf.compiler.PreprocessorDefinitions; + foreach (const ProString &path, project->values("RC_INCLUDEPATH")) { + QString fixedPath = fileFixify(path.toQString()); + if (fileInfo(fixedPath).isRelative()) { + if (fixedPath == QStringLiteral(".")) + fixedPath = QStringLiteral("$(ProjectDir)"); + else + fixedPath.prepend(QStringLiteral("$(ProjectDir)\\")); + } + conf.resource.AdditionalIncludeDirectories << escapeFilePath(fixedPath); + } + // 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 // to add it for the compiler) However, the resource tool does not do this. |