aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8engine_p.h
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-05-22 15:30:11 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-24 09:41:29 +0200
commit2a5d05dd3c9d42794d6863425598b8a838ebfb63 (patch)
tree14e34c1f23abbbed5fd43ea996bc9f829828b8d1 /src/qml/qml/v8/qv8engine_p.h
parentafc0d1f0454858aefb342353afb4df4b27863382 (diff)
Remove QJSEngine::ContextOwnership and associated constructor
This API was intended for QtWebKit integration, but we decided to keep it out of the public headers and introduce it in a different way later. Change-Id: I7f30b20b741eca8569e63a7e4e27171d75293567 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine_p.h')
-rw-r--r--src/qml/qml/v8/qv8engine_p.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 772fa82c5a..0cd54ae3a1 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -231,7 +231,11 @@ public:
static QV8Engine* get(QJSEngine* q) { Q_ASSERT(q); return q->handle(); }
static QJSEngine* get(QV8Engine* d) { Q_ASSERT(d); return d->q; }
- QV8Engine(QJSEngine* qq,QJSEngine::ContextOwnership ownership = QJSEngine::CreateNewContext);
+ enum ContextOwnership {
+ AdoptCurrentContext,
+ CreateNewContext
+ };
+ QV8Engine(QJSEngine* qq, ContextOwnership ownership = CreateNewContext);
virtual ~QV8Engine();
// This enum should be in sync with QQmlEngine::ObjectOwnership