diff options
| author | Leonard Lee <leonard.lee@digia.com> | 2013-06-04 13:53:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-04 17:56:03 +0200 |
| commit | d1f391b1bb75b0f466e93f818674dde2e9135f36 (patch) | |
| tree | 7ce08924f43e830b79f5b00a08ff86541ab15a35 | |
| parent | dd82932ab27537d0e1eb22d47030fef9047d832a (diff) | |
Remove Nokia references.
These Nokia references removed as they are not appropriate.
Task-number: QTBUG-31400
Change-Id: Ib80d2c2d28353e74c46e9ead9cde9807dad7022d
(cherry-picked from qtdoc/019f96bc47cf56170c125ae90f5fc00059f6665d)
(cherry-picked from qtwebkit/d7b8c69ccdd5547b5660be5876dbdedc3ac29548)
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/src/images/qwebview-url.png | bin | 191610 -> 0 bytes | |||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/doc/src/images/qwebview-url.png b/doc/src/images/qwebview-url.png Binary files differdeleted file mode 100644 index 3c40080851..0000000000 --- a/doc/src/images/qwebview-url.png +++ /dev/null diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp index 76b927bace..1d15aa80f9 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp @@ -224,10 +224,6 @@ protected: It can be used in various applications to display web content live from the Internet. - The image below shows QWebView previewed in \QD with a Nokia website. - - \image qwebview-url.png - A web site can be loaded onto QWebView with the load() function. Like all Qt widgets, the show() function must be invoked in order to display QWebView. The snippet below illustrates this: diff --git a/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp b/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp index 408630eb11..926757b5ad 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp +++ b/src/3rdparty/webkit/Source/WebKit/qt/docs/webkitsnippets/simple/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) QWidget *parent = 0; //! [Using QWebView] QWebView *view = new QWebView(parent); - view->load(QUrl("http://qt.nokia.com/")); + view->load(QUrl("http://qt-project.org")); view->show(); //! [Using QWebView] return app.exec(); |
