Merge branch 'release' into stable

Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
author: Sergio Ahumada <sergio.ahumada@digia.com> 2013-01-31 18:55:53 +0100
committer: Sergio Ahumada <sergio.ahumada@digia.com> 2013-01-31 18:55:53 +0100
commit: 6239af6f0f15871e02a516c97c5f1775743d352b (patch)
tree: 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/xml
parent: 3dc47622a469ded1c99397fdedc2053b73d57189 (diff)
parent: 6654a05fcad565a302e205e7f7deaa0b2757082d (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	Sergio Ahumada <sergio.ahumada@digia.com>	2013-01-31 18:55:53 +0100
committer	Sergio Ahumada <sergio.ahumada@digia.com>	2013-01-31 18:55:53 +0100
commit	6239af6f0f15871e02a516c97c5f1775743d352b (patch)
tree	904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/xml
parent	3dc47622a469ded1c99397fdedc2053b73d57189 (diff)
parent	6654a05fcad565a302e205e7f7deaa0b2757082d (diff)