diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-26 10:42:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-26 10:42:44 +0200 |
| commit | 33b26980cb24288b5a9f2590ccf32a949281bb79 (patch) | |
| tree | cc0203dac37338b24b0b25a4694c0b76d4e4164b /Source/WebKit/qt/declarative/plugin.cpp | |
| parent | 715be629d51174233403237bfc563cf150087dc8 (diff) | |
| download | qtwebkit-33b26980cb24288b5a9f2590ccf32a949281bb79.tar.gz | |
Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 (http://svn.webkit.org/repository/webkit/trunk@129610)
New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index db748952a..56eac632d 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -21,10 +21,6 @@ #include "qglobal.h" -#if defined(HAVE_QQUICK1) -#include "qdeclarativewebview_p.h" -#endif - #include <QtQml/qqml.h> #include <QtQml/qqmlextensionplugin.h> @@ -56,15 +52,6 @@ public: virtual void registerTypes(const char* uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit")); -#if defined(HAVE_QQUICK1) - qmlRegisterType<QDeclarativeWebSettings>(); - qmlRegisterType<QDeclarativeWebView>(uri, 1, 0, "WebView"); -#ifdef Q_REVISION - qmlRegisterType<QDeclarativeWebView>(uri, 1, 1, "WebView"); - qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0); - qmlRegisterRevision<QDeclarativeWebView, 1>("QtWebKit", 1, 1); -#endif -#endif #if defined(HAVE_WEBKIT2) qmlRegisterType<QQuickWebView>(uri, 3, 0, "WebView"); |