From bb9cca643faa6d365b4e326f13fa836c8f820649 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 23 Sep 2019 11:50:06 +0200 Subject: [PATCH] [libcalamares] Avoid warnings from MOC-generated code - Moc generates Q_UNUSED(_a); which in turn (with clang) issues a superfluous-semicolon warning. Existing code with automoc uses utils/moc-warnings.h to turn off warnings that are issued on moc code. Include it explicitly here because automoc isn't applied. --- src/libcalamares/modulesystem/Tests.cpp | 1 + src/libcalamares/network/Manager.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libcalamares/modulesystem/Tests.cpp b/src/libcalamares/modulesystem/Tests.cpp index 8ef62a098..4ef5840ea 100644 --- a/src/libcalamares/modulesystem/Tests.cpp +++ b/src/libcalamares/modulesystem/Tests.cpp @@ -130,4 +130,5 @@ ModuleSystemTests::testBadFromStringCases() QTEST_GUILESS_MAIN( ModuleSystemTests ) +#include "utils/moc-warnings.h" #include "Tests.moc" diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp index fefa7c375..6243b03b3 100644 --- a/src/libcalamares/network/Manager.cpp +++ b/src/libcalamares/network/Manager.cpp @@ -285,4 +285,5 @@ Manager::asynchronouseGet( const QUrl& url, const CalamaresUtils::Network::Reque } // namespace Network } // namespace CalamaresUtils +#include "utils/moc-warnings.h" #include "Manager.moc"