diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit/qt/declarative/plugin.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
| -rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index e2f0fb3ec..968b1fe18 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -17,19 +17,19 @@ Boston, MA 02110-1301, USA. */ +#if defined(HAVE_QQUICK1) #include "qdeclarativewebview_p.h" +#endif #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qdeclarativeextensionplugin.h> #if defined(HAVE_WEBKIT2) -#include "qquickwebpage_p.h" -#include "qquickwebview_p.h" -#include "qtwebsecurityorigin_p.h" -#include "qwebiconimageprovider_p.h" -#include "qwebnavigationrequest_p.h" -#include "qwebpermissionrequest_p.h" -#include "qwebpreferences_p.h" +#include "private/qquickwebpage_p.h" +#include "private/qquickwebview_p.h" +#include "private/qwebiconimageprovider_p.h" +#include "private/qwebloadrequest_p.h" +#include "private/qwebnavigationrequest_p.h" #include <QtDeclarative/qdeclarativeengine.h> #include <QtNetwork/qnetworkreply.h> @@ -51,6 +51,7 @@ 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 @@ -58,16 +59,14 @@ public: qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0); qmlRegisterRevision<QDeclarativeWebView, 1>("QtWebKit", 1, 1); #endif +#endif #if defined(HAVE_WEBKIT2) qmlRegisterType<QQuickWebView>(uri, 3, 0, "WebView"); - qmlRegisterUncreatableType<QWebPreferences>(uri, 3, 0, "WebPreferences", QObject::tr("Cannot create separate instance of WebPreferences")); qmlRegisterUncreatableType<QQuickWebPage>(uri, 3, 0, "WebPage", QObject::tr("Cannot create separate instance of WebPage, use WebView")); qmlRegisterUncreatableType<QNetworkReply>(uri, 3, 0, "NetworkReply", QObject::tr("Cannot create separate instance of NetworkReply")); - qmlRegisterUncreatableType<QWebPermissionRequest>(uri, 3, 0, "PermissionRequest", QObject::tr("Cannot create separate instance of PermissionRequest")); qmlRegisterUncreatableType<QWebNavigationRequest>(uri, 3, 0, "NavigationRequest", QObject::tr("Cannot create separate instance of NavigationRequest")); - qmlRegisterUncreatableType<QtWebSecurityOrigin>(uri, 3, 0, "SecurityOrigin", QObject::tr("Cannot create separate instance of SecurityOrigin")); - + qmlRegisterUncreatableType<QWebLoadRequest>(uri, 3, 0, "WebLoadRequest", QObject::tr("Cannot create separate instance of WebLoadRequest")); #endif } }; @@ -77,4 +76,3 @@ QT_END_NAMESPACE #include "plugin.moc" Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); - |