diff options
| author | Charles Yin <charles.yin@nokia.com> | 2012-02-09 13:00:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 23:38:15 +0100 |
| commit | 85069f4315e6f5a26ad78eea1db660cce4db8dd0 (patch) | |
| tree | 1a3d122e925883d552733a51de1c7985003ff6cb /src/declarative/qml/v8/qv8engine.cpp | |
| parent | 82dfecab38031f8009ea64ef93063c02b79eaf94 (diff) | |
Remove deprecated builtin sql database API.
The new local storage API has been implemented as a standalone module plugin
for a while, and qtquick1 has been moved into a seperated repo, so
the old API can be safely removed now.
Task-number:QTBUG-21538
Change-Id: Ib89f34797afe492ad4987d5afa8ff23cdca044ab
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index 2f266a010e..405e406c88 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -53,7 +53,6 @@ #include <private/qdeclarativeengine_p.h> #include <private/qdeclarativeapplication_p.h> #include <private/qdeclarativexmlhttprequest_p.h> -#include <private/qdeclarativesqldatabase_p.h> #include <private/qdeclarativelocale_p.h> #include "qscript_impl_p.h" @@ -121,7 +120,6 @@ QV8Engine::QV8Engine(QJSEngine* qq, QJSEngine::ContextOwnership ownership) , m_engine(0) , m_ownsV8Context(ownership == QJSEngine::CreateNewContext) , m_xmlHttpRequestData(0) - , m_sqlDatabaseData(0) , m_listModelData(0) { qMetaTypeId<QJSValue>(); @@ -167,9 +165,7 @@ QV8Engine::~QV8Engine() delete m_extensionData[ii]; m_extensionData.clear(); - qt_rem_qmlsqldatabase(this, m_sqlDatabaseData); - m_sqlDatabaseData = 0; - qt_rem_qmlxmlhttprequest(this, m_xmlHttpRequestData); + qt_rem_qmlxmlhttprequest(this, m_xmlHttpRequestData); m_xmlHttpRequestData = 0; delete m_listModelData; m_listModelData = 0; @@ -622,7 +618,6 @@ void QV8Engine::initializeGlobal(v8::Handle<v8::Object> global) m_xmlHttpRequestData = qt_add_qmlxmlhttprequest(this); qt_add_sqlexceptions(this); - m_sqlDatabaseData = qt_add_qmlsqldatabase(this); { v8::Handle<v8::Value> args[] = { global }; |