summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-02-06 13:03:48 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-06 13:39:23 (GMT)
commitfc0a203ba7595a67c632e121a3039f424ddc8348 (patch)
tree99182784960d0f4e9483bf9a8f4f107abcf995c7 /src/activeqt
parent36202cf8fca822492615d418bd563a40bee4af08 (diff)
downloadQt-fc0a203ba7595a67c632e121a3039f424ddc8348.zip
Qt-fc0a203ba7595a67c632e121a3039f424ddc8348.tar.gz
Qt-fc0a203ba7595a67c632e121a3039f424ddc8348.tar.bz2
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 Change-Id: I18606bb1e53a334256658cc5b8d8a13c0d6617a1 Reviewed-by: Martin Petersson Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/activeqt')
-rw-r--r--src/activeqt/control/qaxserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index f641660..8b6de43 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;