瀏覽代碼

Autogen: Check .moc header name against SKIP list

When encountering an #include "FOO.moc" statement where
FOO.hpp was chosen over FOO.cpp as the moc source, the
FOO.hpp name was not checked against the moc SKIP list.
Sebastian Holtermann 8 年之前
父節點
當前提交
83d8aceeb3
共有 1 個文件被更改,包括 1 次插入1 次删除
  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)) {