diff options
| author | Robert Griebl <rgriebl@trolltech.com> | 2010-03-12 14:40:20 (GMT) |
|---|---|---|
| committer | Robert Griebl <rgriebl@trolltech.com> | 2010-03-12 14:40:20 (GMT) |
| commit | 60fca92b1f1f4a6f6c1ac8ac534650ef49af469e (patch) | |
| tree | 90d99ca1f6bb841ab6221c8959c70cf5f9790ecd | |
| parent | f0c9be5f6d1dd0458f866d84b3ec991c9988d65c (diff) | |
| download | Qt-60fca92b1f1f4a6f6c1ac8ac534650ef49af469e.zip Qt-60fca92b1f1f4a6f6c1ac8ac534650ef49af469e.tar.gz Qt-60fca92b1f1f4a6f6c1ac8ac534650ef49af469e.tar.bz2 | |
Add DEFINES to mingw32/windres.exe command line.
qmake didn't add $DEFINES to the windres.exe command line, while it was
added to the rc.exe command line.
Task-number: QTBUG-7773
Reviewed-by: Marius Storm-Olsen
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index fd43145..0936d15 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -415,7 +415,7 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t) if (!rc_file.isEmpty()) { t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t" << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") - << " --include-dir=" << incPathStr << endl << endl; + << " --include-dir=" << incPathStr << " $(DEFINES)" << endl << endl; } } |