1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence a bunch of gcc warnings for the moc test

Browse Source 
We deliberately expose moc to warning-worthy C++, but we don't want the
compiler warnings coming from those.

Change-Id: I09c36d7c8bfbb88f7bde61fa7bcc52a5adde81da
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Volker Hilsheimer 2021-03-29 14:01:50 +02:00
parent c8f6f8a222
commit 5925daf969
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/tools/moc/cxx-attributes.h
View File

@ -33,6 +33,7 @@
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wunknown-attributes") QT_WARNING_DISABLE_CLANG("-Wunknown-attributes")
QT_WARNING_DISABLE_GCC("-Wattributes")
class CppAttribute : public QObject class CppAttribute : public QObject
{ {

5
tests/auto/tools/moc/cxx11-explicit-override-control.h
View File

@ -36,6 +36,9 @@
# define sealed # define sealed
#endif #endif
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wsuggest-override")
class ExplicitOverrideControlBase : public QObject class ExplicitOverrideControlBase : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -234,6 +237,8 @@ private Q_SLOTS:
#endif #endif
}; };
QT_WARNING_POP
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
# undef final # undef final
# undef sealed # undef sealed

6
tests/auto/tools/moc/tst_moc.cpp
View File

@ -322,6 +322,8 @@ public:
void foo(struct ForwardDeclaredStruct *); void foo(struct ForwardDeclaredStruct *);
}; };
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wunused-variable")
void StructQObject::foo(struct ForwardDeclaredStruct *) void StructQObject::foo(struct ForwardDeclaredStruct *)
{ {
struct Inner { struct Inner {
@ -330,10 +332,11 @@ void StructQObject::foo(struct ForwardDeclaredStruct *)
Q_DECL_UNUSED_MEMBER struct Inner unusedVariable; Q_DECL_UNUSED_MEMBER struct Inner unusedVariable;
} }
QT_WARNING_POP
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers") QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers")
QT_WARNING_DISABLE_GCC("-Wignored-qualifiers")
class TestClass : public MyNamespace::TestSuperClass, public DONT_CONFUSE_MOC(MyStruct), class TestClass : public MyNamespace::TestSuperClass, public DONT_CONFUSE_MOC(MyStruct),
public DONT_CONFUSE_MOC_EVEN_MORE(MyStruct2, dummy, ignored) public DONT_CONFUSE_MOC_EVEN_MORE(MyStruct2, dummy, ignored)
@ -1764,6 +1767,7 @@ void tst_Moc::QTBUG5590_dummyProperty()
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers") QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers")
QT_WARNING_DISABLE_GCC("-Wignored-qualifiers")
class QTBUG7421_ReturnConstTemplate: public QObject class QTBUG7421_ReturnConstTemplate: public QObject
{ Q_OBJECT { Q_OBJECT
public slots: public slots: