diff options
author | Cristiano di Flora <cristiano.di-flora@nokia.com> | 2012-04-05 10:35:18 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 13:03:14 +0200 |
commit | 67cf5cb47896b7634bd105cd8a86ea708fe046e4 (patch) | |
tree | 3ce4ca0b72859a2c3a33c4f632caa90bf47386e9 /src/contacts/qcontactmanager_p.cpp | |
parent | 41b99a1a9f4e2de4cb44b9099417ee24b5ec9ff0 (diff) |
Remove workaround for fixed bug in qobject_cast.
Change-Id: I15a03f29d00ab1cf7911e3cc4af3313a4ad6c09b
Reviewed-by: Tommi Anttila <tommi.4.anttila@nokia.com>
Diffstat (limited to 'src/contacts/qcontactmanager_p.cpp')
-rw-r--r-- | src/contacts/qcontactmanager_p.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp index 77533363b..83336a303 100644 --- a/src/contacts/qcontactmanager_p.cpp +++ b/src/contacts/qcontactmanager_p.cpp @@ -154,10 +154,7 @@ void QContactManagerData::createEngine(const QString &managerName, const QMap<QS versions.contains(implementationVersion)) { QContactManagerEngine* engine = f->engine(parameters, &m_lastError); // if it's a V2, use it - // qobject_cast for QContactManagerEngineV2 broken, see QTMOBILITY-1798 - // Workaround: use code behind general qobject_cast explicitly: - //m_engine = qobject_cast<QContactManagerEngineV2*>(engine); - m_engine = static_cast<QContactManagerEngineV2*>(reinterpret_cast<QContactManagerEngineV2*>(0)->staticMetaObject.cast(engine)); + m_engine = qobject_cast<QContactManagerEngineV2*>(engine); if (!m_engine && engine) { // Nope, v1, so wrap it m_engine = new QContactManagerEngineV2Wrapper(engine); |