From c6cb4ddbf9401ca430a0c0fb0324040313131658 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 5 Feb 2013 15:46:28 +0100
Subject: qMetaTypeId(): deprecate the dummy parameter.

It was there because of MSVC6 compatibility.

It is not removed, because some code used to do
 qMetaTypeId(&myVariable);

This was not a documented feature anyway, so it should not be user
visible.

Change-Id: I55327d7e73e67a6bb741817741d530d5a650291a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/dbus/qdbusreply.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dbus/qdbusreply.h')

diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h
index 1d73e61cc4..7b4a4ebcf8 100644
--- a/src/dbus/qdbusreply.h
+++ b/src/dbus/qdbusreply.h
@@ -69,7 +69,7 @@ public:
     }
     inline QDBusReply& operator=(const QDBusMessage &reply)
     {
-        QVariant data(qMetaTypeId(&m_data), reinterpret_cast<void*>(0));
+        QVariant data(qMetaTypeId<Type>(), reinterpret_cast<void*>(0));
         qDBusReplyFill(reply, m_error, data);
         m_data = qvariant_cast<Type>(data);
         return *this;
-- 
cgit v1.2.3