summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/myobject.h5
-rw-r--r--tests/auto/dbus/qdbusmarshall/common.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/myobject.h b/tests/auto/dbus/qdbusabstractadaptor/myobject.h
index 1d9b33ccd8..fe3f6f3dd2 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/myobject.h
+++ b/tests/auto/dbus/qdbusabstractadaptor/myobject.h
@@ -242,10 +242,13 @@ public:
{
case 4:
if4 = new Interface4(this);
+ Q_FALLTHROUGH();
case 3:
if3 = new Interface3(this);
+ Q_FALLTHROUGH();
case 2:
if2 = new Interface2(this);
+ Q_FALLTHROUGH();
case 1:
if1 = new Interface1(this);
}
@@ -270,4 +273,4 @@ signals:
void nonScriptableSignalVoid();
};
-#endif // MYOBJECT_H \ No newline at end of file
+#endif // MYOBJECT_H
diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h
index f37ba47508..44346cd6f2 100644
--- a/tests/auto/dbus/qdbusmarshall/common.h
+++ b/tests/auto/dbus/qdbusmarshall/common.h
@@ -437,7 +437,7 @@ bool compareToArgument(const QDBusArgument &arg, const QVariant &v2)
case QVariant::DateTime:
return compare<QDateTime>(arg, v2);
default:
- register int id = v2.userType();
+ int id = v2.userType();
if (id == qMetaTypeId<QDBusObjectPath>())
return compare<QDBusObjectPath>(arg, v2);
else if (id == qMetaTypeId<QDBusSignature>())