summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/moc/tst_moc.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-21 17:22:03 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-23 01:18:13 +0200
commit6ece7dd09ac8897b70b062507d2bff69e5e4115a (patch)
tree1677ce41d18d51554e897626abc16526adef19a9 /tests/auto/tools/moc/tst_moc.cpp
parent2e7f11246e8b5bd0952c3b498da04ae4fc14f264 (diff)
Fix warnings in tst_moc
Change-Id: I4cbc851e59febdc533c02fb4b95d2924348086b4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/tools/moc/tst_moc.cpp')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index c866fcd903..f0f8523f19 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -327,9 +327,13 @@ void StructQObject::foo(struct ForwardDeclaredStruct *)
bool field;
};
- struct Inner unusedVariable;
+ Q_DECL_UNUSED_MEMBER struct Inner unusedVariable;
}
+
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers")
+
class TestClass : public MyNamespace::TestSuperClass, public DONT_CONFUSE_MOC(MyStruct),
public DONT_CONFUSE_MOC_EVEN_MORE(MyStruct2, dummy, ignored)
{
@@ -551,6 +555,8 @@ private slots:
virtual inline void blub2() {}
};
+QT_WARNING_POP
+
class PropertyTestClass : public QObject
{
Q_OBJECT
@@ -1757,6 +1763,8 @@ void tst_Moc::QTBUG5590_dummyProperty()
QCOMPARE(o.value2(), 82);
}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wignored-qualifiers")
class QTBUG7421_ReturnConstTemplate: public QObject
{ Q_OBJECT
public slots:
@@ -1766,7 +1774,7 @@ public slots:
const QString returnConstString(const QString s) { return s; }
QString const returnConstString2( QString const s) { return s; }
};
-
+QT_WARNING_POP
struct science_constant {};
struct science_const {};