diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-01-12 13:40:09 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-03-05 14:35:32 +0000 |
| commit | f9966f351678351ee6b971d7b6b25a4987407e46 (patch) | |
| tree | baab124c7e2ba3dfb281ddfa222f50d864115e21 | |
| parent | 3f0f7b59582197ca651b8aaeea17fd76b9a35b9c (diff) | |
Doc: Link issues Qt WebKit
Removed obsolete references QInputContext and QtDeclarative
Task-number: QTBUG-43775
Change-Id: I308931beaec5ef2067350649135c26df1fe3817b
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebpage.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/docs/qtwebkit-bridge.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp index 5ddc5b457..02bddebda 100644 --- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp @@ -1003,7 +1003,7 @@ bool QWebPagePrivate::gestureEvent(QGestureEvent* event) \a property specifies which property is queried. - \sa QWidget::inputMethodEvent(), QInputMethodEvent, QInputContext + \sa QWidget::inputMethodEvent(), QInputMethodEvent */ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const { diff --git a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc index 5db9e931c..674475bee 100644 --- a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc +++ b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc @@ -22,7 +22,7 @@ The playlist manager is usually best authored as a classic desktop application, with the native-looking robust \l{QWidget}s as the application's backbone. The media-player control usually has a custom look and feel and is best written using the \l{Graphics View framework} - or \l{QtDeclarative}. The music store, which shows dynamic content + or \l{Qt Quick}. The music store, which shows dynamic content from the Internet and gets modified rapidly, is best authored in HTML and maintained on the server. With the Qt WebKit bridge, the music store component can interact with native parts of the application, |