Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7

3 files changed, 19 insertions, 2 deletions

diff --git a/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp b/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
new file mode 100644
index 0000000..0ba1cad
--- /dev/null
+++ b/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
@@ -0,0 +1,17 @@
+
+void wrapInFunction()
+{
+
+//! [0]
+    // ...
+    QWebPage *page = new QWebPage;
+    // ...
+
+    QWebInspector *inspector = new QWebInspector;
+    inspector->setPage(page);
+
+    connect(page, SIGNAL(webInspectorTriggered(const QWebElement&)), inspector, SLOT(show()));
+//! [0]
+
+}
+
diff --git a/WebKit/qt/docs/webkitsnippets/simple/main.cpp b/WebKit/qt/docs/webkitsnippets/simple/main.cpp
index 82f5b6c..408630e 100644
--- a/WebKit/qt/docs/webkitsnippets/simple/main.cpp
+++ b/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://qtsoftware.com/"));
+    view->load(QUrl("http://qt.nokia.com/"));
     view->show();
 //! [Using QWebView]
     return app.exec();
diff --git a/WebKit/qt/docs/webkitsnippets/webpage/main.cpp b/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
index b91bc30..393b16a 100644
--- a/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
+++ b/WebKit/qt/docs/webkitsnippets/webpage/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    Thumbnailer thumbnail(QUrl("http://qtsoftware.com"));
+    Thumbnailer thumbnail(QUrl("http://qt.nokia.com"));
 
     QObject::connect(&thumbnail, SIGNAL(finished()),
         &app, SLOT(quit()));