diff options
author | Andy Shaw <andy.shaw@digia.com> | 2011-12-29 13:44:57 (GMT) |
---|---|---|
committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:10 (GMT) |
commit | 41853d117ca53c0bf475c28effdcb952c86620f0 (patch) | |
tree | 2cb52431481e698f0db898ea2c1e06786e7df26a | |
parent | 3d3576eadd1bc84d67890a288eb46111ce67433c (diff) | |
download | Qt-41853d117ca53c0bf475c28effdcb952c86620f0.zip Qt-41853d117ca53c0bf475c28effdcb952c86620f0.tar.gz Qt-41853d117ca53c0bf475c28effdcb952c86620f0.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
Reviewed-by: Martin Petersson
-rw-r--r-- | src/activeqt/control/qaxserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |