diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-03-13 14:40:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 11:43:31 +0100 |
| commit | 0402743339cbf9efe0ea4ebbd36b27bbc7e9e7a6 (patch) | |
| tree | 6929f6b0190806465ab73d8bfaa00819a7d4df07 /src/webengine/ui_delegates_manager.h | |
| parent | 38b5dc5fbdae25491435395202f6980f44ca8ef5 (diff) | |
UI: fix a crash on shutdown
Use a raw pointer instead of QScopedPointer for the UI components.
Since the components are always parented to the view and deleted through
the QObject cleanup mechanism, it was not correct to use QScopedPointer
in the first place.
Change-Id: I0c8fd9526e898439c52c6a6f538a66f8a1185ef9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/ui_delegates_manager.h')
| -rw-r--r-- | src/webengine/ui_delegates_manager.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h index a6d15a530..125cacff4 100644 --- a/src/webengine/ui_delegates_manager.h +++ b/src/webengine/ui_delegates_manager.h @@ -49,7 +49,6 @@ #include <QExplicitlySharedDataPointer> #include <QPoint> #include <QQmlComponent> -#include <QScopedPointer> #include <QSharedPointer> #include <QUrl> @@ -67,7 +66,7 @@ #define ENUM_DECLARATION(TYPE, COMPONENT) \ TYPE #define MEMBER_DECLARATION(TYPE, COMPONENT) \ - QScopedPointer<QQmlComponent> COMPONENT##Component + QQmlComponent *COMPONENT##Component class JavaScriptDialogController; QT_BEGIN_NAMESPACE |