diff options
author | Rolland Dudemaine <rolland@ghs.com> | 2011-10-12 20:38:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 20:25:53 +0100 |
commit | 6c0033f8e64c6583a8a4df00f01b32a2818b4e86 (patch) | |
tree | be11b89ba2b9a2bed0506f5e2a3fd072e97f3032 /qmake | |
parent | a69446d4e9562ec04541efd50ff6832686b0906d (diff) |
Add -nn for .cpp MOC preprocessing for INTEGRITY
qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.
Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 480b2f4c79160afaac7934936d3ae6ea382ae2bb)
Change-Id: I480b2f4c79160afaac7934936d3ae6ea382ae2bb
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/integrity/gbuild.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp index aaf243dc76..f9fdb3885b 100644 --- a/qmake/generators/integrity/gbuild.cpp +++ b/qmake/generators/integrity/gbuild.cpp @@ -398,6 +398,7 @@ QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove filepath.remove(0, 1); } s += "\n\t:preexecShellSafe='${QT_BUILD_DIR}/bin/moc "; + s += "-nn "; s += varGlue("DEFINES", "-D", " -D", " "); s += varGlue("INCLUDEPATH", "-I", " -I", " "); s += filepath; |