Browse Source

Merge branch 'autogen-header-skip' into release-3.9

Brad King 8 years ago
parent
commit
ef31812ede
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Source/cmQtAutoGenerators.cxx

+ 1 - 1
Source/cmQtAutoGenerators.cxx

@@ -1003,7 +1003,7 @@ bool cmQtAutoGenerators::MocParseSourceContent(
             // In relaxed mode try to find a header instead but issue a warning
             const std::string headerToMoc =
               this->MocFindHeader(scannedFileAbsPath, incSubDir + incBasename);
-            if (!headerToMoc.empty()) {
+            if (!headerToMoc.empty() && !this->MocSkip(headerToMoc)) {
               // This is for KDE4 compatibility:
               fileToMoc = headerToMoc;
               if (!requiresMoc && (incBasename == scannedFileBasename)) {