From 6c0033f8e64c6583a8a4df00f01b32a2818b4e86 Mon Sep 17 00:00:00 2001 From: Rolland Dudemaine Date: Wed, 12 Oct 2011 20:38:10 +0200 Subject: [PATCH] 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 (cherry picked from commit 480b2f4c79160afaac7934936d3ae6ea382ae2bb) Change-Id: I480b2f4c79160afaac7934936d3ae6ea382ae2bb --- qmake/generators/integrity/gbuild.cpp | 1 + 1 file changed, 1 insertion(+) 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;