diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-07-05 13:29:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 15:02:58 +0200 |
| commit | 5d6f8b18fe77d2fc17a3c1d77d1c4baeff0e9704 (patch) | |
| tree | 507f652c897825a7f6b3a09a5dd2c09d6c1797f4 /src/qml/qml/qqmlengine.cpp | |
| parent | 2e4d1ccb18aba13f94670d3d1104839fecf2ab5c (diff) | |
Get rid of the first half of QQmlGuard usage
QQmlGuard was being used as a more performant replacement
for QPointer. QPointer got now fixed in Qt 5.0, making this
class obsolete.
Change-Id: I77eef066c4823af4b074ef32d4d78dbd67c36cd0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index be1c28c62b..2b186dbb75 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -986,7 +986,7 @@ QQmlNetworkAccessManagerFactory *QQmlEngine::networkAccessManagerFactory() const void QQmlEnginePrivate::registerFinalizeCallback(QObject *obj, int index) { if (activeVME) { - activeVME->finalizeCallbacks.append(qMakePair(QQmlGuard<QObject>(obj), index)); + activeVME->finalizeCallbacks.append(qMakePair(QPointer<QObject>(obj), index)); } else { void *args[] = { 0 }; QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, index, args); |