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/winmakefile.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/winmakefile.cpp')
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index fcc9ceb5aa..fc98c3ddd1 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -783,8 +783,20 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t) // use these defines in the .rc file itself. Also, we need to add the _DEBUG define manually // 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. + + const ProStringList rcIncPaths = project->values("RC_INCLUDEPATH"); + QString incPathStr; + for (int i = 0; i < rcIncPaths.count(); ++i) { + const ProString &path = rcIncPaths.at(i); + if (path.isEmpty()) + continue; + incPathStr += QStringLiteral(" /i "); + incPathStr += escapeFilePath(path); + } + 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)" << incPathStr << " -fo " << res_file << " " << rc_file; t << endl << endl; } } |