Merge remote-tracking branch 'origin/stable' into dev

Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
author: Frederik Gladhorn <frederik.gladhorn@digia.com> 2013-02-13 11:58:07 +0100
committer: Frederik Gladhorn <frederik.gladhorn@digia.com> 2013-02-14 14:24:57 +0100
commit: e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch)
tree: 8965835c375422d63b2ccfa927b31a56e64bda1d /examples/xml
parent: d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff)
parent: e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff)
8 files changed, 27 insertions, 27 deletions
diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel
index 6bd63b8b07..2fd5c2e09d 100644
--- a/examples/xml/dombookmarks/frank.xbel
+++ b/examples/xml/dombookmarks/frank.xbel
@@ -71,16 +71,16 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://qt.nokia.com/doc/2.3/">
+            <bookmark href="http://doc.qt.digia.com/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/3.3/">
+            <bookmark href="http://doc.qt.digia.com/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/4.0/">
+            <bookmark href="http://doc.qt.digia.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/">
+            <bookmark href="http://qt-project.org/">
                 <title>Qt Home Page</title>
             </bookmark>
         </folder>
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index 36256fda0a..74b7f1519f 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -45,16 +45,16 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://qt.nokia.com/doc/qq/">
+        <bookmark href="http://doc.qt.digia.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/">
+        <bookmark href="http://qt-project.org/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/doc/4.0/">
+        <bookmark href="http://doc.qt.digia.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/developer/faqs/">
+        <bookmark href="http://qt-project.org/faq/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
diff --git a/examples/xml/htmlinfo/simpleexample.html b/examples/xml/htmlinfo/simpleexample.html
index 83a55cf00a..d46a494979 100644
--- a/examples/xml/htmlinfo/simpleexample.html
+++ b/examples/xml/htmlinfo/simpleexample.html
@@ -5,7 +5,7 @@
     </head>
     <body>
         <p>A paragraph.</p>
-        <p>A second paragraph. Check out our <a href="http://labs.qt.nokia.com/">developer blogs</a></p>
-        <p>And the last paragraph. Or our <a href="http://qt.nokia.com/doc/">online documentation</a>.</p>
+        <p>A second paragraph. Check out our <a href="http://blog.qt.digia.com/">developer blogs</a></p>
+        <p>And the last paragraph. Or our <a href="http://qt-project.org/doc/">online documentation</a>.</p>
     </body>
 </html>
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index 96779b6fd8..2105fe7e10 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -76,7 +76,7 @@ RSSListing::RSSListing(QWidget *parent)
 {
 
     lineEdit = new QLineEdit(this);
-    lineEdit->setText("http://labs.qt.nokia.com/blogs/feed");
+    lineEdit->setText("http://blog.qt.digia.com/feed/");
 
     fetchButton = new QPushButton(tr("Fetch"), this);
 
diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel
index 6bd63b8b07..2fd5c2e09d 100644
--- a/examples/xml/saxbookmarks/frank.xbel
+++ b/examples/xml/saxbookmarks/frank.xbel
@@ -71,16 +71,16 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://qt.nokia.com/doc/2.3/">
+            <bookmark href="http://doc.qt.digia.com/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/3.3/">
+            <bookmark href="http://doc.qt.digia.com/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/4.0/">
+            <bookmark href="http://doc.qt.digia.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/">
+            <bookmark href="http://qt-project.org/">
                 <title>Qt Home Page</title>
             </bookmark>
         </folder>
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index d6a5b41d05..d37b8224df 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -45,16 +45,16 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://qt.nokia.com/doc/qq/">
+        <bookmark href="http://doc.qt.digia.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/">
+        <bookmark href="http://qt-project.org/">
             <title>qt home page</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/doc/4.0/">
+        <bookmark href="http://doc.qt.digia.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/developer/faqs/">
+        <bookmark href="http://qt-project.org/faq/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel
index 6bd63b8b07..2fd5c2e09d 100644
--- a/examples/xml/streambookmarks/frank.xbel
+++ b/examples/xml/streambookmarks/frank.xbel
@@ -71,16 +71,16 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://qt.nokia.com/doc/2.3/">
+            <bookmark href="http://doc.qt.digia.com/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/3.3/">
+            <bookmark href="http://doc.qt.digia.com/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/doc/4.0/">
+            <bookmark href="http://doc.qt.digia.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qt.nokia.com/">
+            <bookmark href="http://qt-project.org/">
                 <title>Qt Home Page</title>
             </bookmark>
         </folder>
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index 36256fda0a..74b7f1519f 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -45,16 +45,16 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://qt.nokia.com/doc/qq/">
+        <bookmark href="http://doc.qt.digia.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/">
+        <bookmark href="http://qt-project.org/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/doc/4.0/">
+        <bookmark href="http://doc.qt.digia.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qt.nokia.com/developer/faqs/">
+        <bookmark href="http://qt-project.org/faq/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
author	Frederik Gladhorn <frederik.gladhorn@digia.com>	2013-02-13 11:58:07 +0100
committer	Frederik Gladhorn <frederik.gladhorn@digia.com>	2013-02-14 14:24:57 +0100
commit	e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch)
tree	8965835c375422d63b2ccfa927b31a56e64bda1d /examples/xml
parent	d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff)
parent	e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff)