diff options
author | Rolland Dudemaine <rolland@ghs.com> | 2011-10-12 18:38:10 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-10-12 18:39:31 (GMT) |
commit | 480b2f4c79160afaac7934936d3ae6ea382ae2bb (patch) | |
tree | 128af4292f0ff9583346ce23b5a735be45d7e0fe /qmake | |
parent | c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e (diff) | |
download | Qt-480b2f4c79160afaac7934936d3ae6ea382ae2bb.zip Qt-480b2f4c79160afaac7934936d3ae6ea382ae2bb.tar.gz Qt-480b2f4c79160afaac7934936d3ae6ea382ae2bb.tar.bz2 |
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>
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 aaf243d..f9fdb38 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; |