diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 08:12:23 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 08:12:23 (GMT) |
commit | 84882c173529352870966f97459ffb17c5a51eb4 (patch) | |
tree | 1f6d56b8ac164e86beaf91142f4df345a10d9d9b /src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp | |
parent | 6aa50af000f85cc4497749fcf0860c8ed244a60e (diff) | |
download | Qt-84882c173529352870966f97459ffb17c5a51eb4.zip Qt-84882c173529352870966f97459ffb17c5a51eb4.tar.gz Qt-84882c173529352870966f97459ffb17c5a51eb4.tar.bz2 |
Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
Integrated:
|| <https://webkit.org/b/40050> || [Qt] Upstream the WebKit QML integration plugin ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp new file mode 100644 index 0000000..f1f165e --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/declarative/plugin.cpp @@ -0,0 +1,43 @@ +/* + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "qdeclarativewebview_p.h" + +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> + +QT_BEGIN_NAMESPACE + +class WebKitQmlPlugin : public QDeclarativeExtensionPlugin { + Q_OBJECT +public: + virtual void registerTypes(const char* uri) + { + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit")); + qmlRegisterType<QDeclarativeWebSettings>(); + qmlRegisterType<QDeclarativeWebView>(uri, 1, 0, "WebView"); + } +}; + +QT_END_NAMESPACE + +#include "plugin.moc" + +Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin)); + |