From 83d8aceeb35d2a378777a35fea1fb7d7c2d76362 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Fri, 30 Jun 2017 13:26:18 +0200
Subject: 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.
---
 Source/cmQtAutoGenerators.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 27e4928..6d3305b 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/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)) {
-- 
cgit v0.12