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>

3 files changed, 1 insertions, 5 deletions

diff --git a/doc/src/images/qwebview-url.png b/doc/src/images/qwebview-url.png
deleted file mode 100644
index 3c40080..0000000
--- 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 76b927b..1d15aa8 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 408630e..926757b 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();