From 41853d117ca53c0bf475c28effdcb952c86620f0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 29 Dec 2011 14:44:57 +0100 Subject: Ensure that the type is not registered as a typedef When qRegisterMetaType() is given a dummy parameter as 0 then it will try to register it as a typedef and not a type. Changing it to be -1 for the dummy parameter will ensure that it is not registered as a typedef. Task-number: QTBUG-18555 Reviewed-by: Martin Petersson --- src/activeqt/control/qaxserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp index 88b6ce5..ffe2d7d 100644 --- a/src/activeqt/control/qaxserver.cpp +++ b/src/activeqt/control/qaxserver.cpp @@ -91,7 +91,7 @@ QAxFactory *qAxFactory() QStringList keys(qax_factory->featureList()); for (int i = 0; i < keys.count(); ++i) { QString key(keys.at(i)); - qRegisterMetaType((key + QLatin1Char('*')).toLatin1(), (void**)0); + qRegisterMetaType((key + QLatin1Char('*')).toLatin1(), (void**)(quintptr)-1); } } return qax_factory; -- cgit v0.12