summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-15 21:59:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-15 21:59:03 (GMT)
commit077513815c65e70d569b8656935ac7783bf4c974 (patch)
tree0f6d106e754004da1d94fa0627f09837171d5512 /qmake/generators
parentfdcb62d5d6a3e295273042555d2551eb491a5b2d (diff)
parent3813e236a8f48babaa850123e3a2a04e80713219 (diff)
downloadQt-077513815c65e70d569b8656935ac7783bf4c974.zip
Qt-077513815c65e70d569b8656935ac7783bf4c974.tar.gz
Qt-077513815c65e70d569b8656935ac7783bf4c974.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
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;
}
}