diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-10 12:26:12 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-10 12:26:12 (GMT) |
commit | ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c (patch) | |
tree | 47a26e1c68b49477a15a383caf6c1c1d0397c276 /src/script/qscriptengine.h | |
parent | 03b28bf56b2edd76ca55ec6e3702db7bca69e757 (diff) | |
parent | 1fddb14c4d0ee82ac66c89061e8a20932f961883 (diff) | |
download | Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.zip Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.gz Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.bz2 |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/script/qscriptengine.h')
-rw-r--r-- | src/script/qscriptengine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h index afd551b..c55caac 100644 --- a/src/script/qscriptengine.h +++ b/src/script/qscriptengine.h @@ -47,6 +47,7 @@ #ifndef QT_NO_SCRIPT #include <QtCore/qvariant.h> +#include <QtCore/qscopedpointer.h> #ifndef QT_NO_QOBJECT #include <QtCore/qobject.h> @@ -114,7 +115,7 @@ public: private: QScriptSyntaxCheckResult(); QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d); - QScriptSyntaxCheckResultPrivate *d_ptr; + QScopedSharedPointer<QScriptSyntaxCheckResultPrivate> d_ptr; Q_DECLARE_PRIVATE(QScriptSyntaxCheckResult) friend class QScriptEnginePrivate; @@ -282,7 +283,7 @@ private: protected: #ifdef QT_NO_QOBJECT - QScriptEnginePrivate *d_ptr; + QScopedPointer<QScriptEnginePrivate> d_ptr; QScriptEngine(QScriptEnginePrivate &dd); #else |