summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2011-12-29 14:44:57 +0100
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 12:25:10 +0200
commit41853d117ca53c0bf475c28effdcb952c86620f0 (patch)
tree2cb52431481e698f0db898ea2c1e06786e7df26a
parent3d3576eadd1bc84d67890a288eb46111ce67433c (diff)
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
-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 88b6ce5aa7..ffe2d7d048 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;