diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 23:39:52 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 23:39:52 (GMT) |
| commit | 651f4336392f86cb5820e3e3cccdc56ec3a0efe8 (patch) | |
| tree | 4435c8348f40a4a2be184063cc5a5197f61a650e /src/imports/webkit/plugin.cpp | |
| parent | f53ac4f7617bfdefcb62e9b27ee6bf1a91a7ed13 (diff) | |
| parent | 5ac068602871b78eb4b58634d58e6b8898acbf8d (diff) | |
| download | Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.zip Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.tar.gz Qt-651f4336392f86cb5820e3e3cccdc56ec3a0efe8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports/webkit/plugin.cpp')
| -rw-r--r-- | src/imports/webkit/plugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/webkit/plugin.cpp b/src/imports/webkit/plugin.cpp index 2f6205d..799fe9e 100644 --- a/src/imports/webkit/plugin.cpp +++ b/src/imports/webkit/plugin.cpp @@ -54,6 +54,7 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("org.webkit")); + QML_REGISTER_NOCREATE_TYPE(QDeclarativeWebSettings); qmlRegisterType<QDeclarativeWebView>(uri,1,0,"WebView"); } }; |