Commit a57b3537 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'autogen-header-skip'

83d8acee Autogen: Check .moc header name against SKIP list
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1017
parents cdb43f1c 83d8acee
Pipeline #63836 passed with stage
in 0 seconds
......@@ -1005,7 +1005,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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment