summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2017-05-06 10:49:12 +0200
committerMarc Mutz <marc.mutz@kdab.com>2017-05-09 17:46:31 +0000
commitf932465ff54ff9ab702cf29ffa100279085b3818 (patch)
tree21f198c29923eefe6b92c9b04c82ad4b44c71735 /tests
parent4084f96052ea1568c847f8cfb52b6ae6d205ec4d (diff)
Remove some more register keywords
They're deprecated since C++11 and removed in C++17. Change-Id: Ia2acd9312707bfee96838743645a04ae1780e5dd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit b92267cd4c4a7c88aab950ad519943d85add1da2)
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/dbus/qdbusmarshall/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/common.h b/tests/auto/dbus/qdbusmarshall/common.h
index 33877e4c9d..c41634d87e 100644
--- a/tests/auto/dbus/qdbusmarshall/common.h
+++ b/tests/auto/dbus/qdbusmarshall/common.h
@@ -442,7 +442,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>())