From 812b3940012f3c04fb79b8fa8c4ac64ff8051dd4 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 13:21:45 +1000
Subject: Update contact URL in license headers.

Reviewed-by: Trust Me
---
 examples/xml/dombookmarks/main.cpp          | 2 +-
 examples/xml/dombookmarks/mainwindow.cpp    | 2 +-
 examples/xml/dombookmarks/mainwindow.h      | 2 +-
 examples/xml/dombookmarks/xbeltree.cpp      | 2 +-
 examples/xml/dombookmarks/xbeltree.h        | 2 +-
 examples/xml/rsslisting/main.cpp            | 2 +-
 examples/xml/rsslisting/rsslisting.cpp      | 2 +-
 examples/xml/rsslisting/rsslisting.h        | 2 +-
 examples/xml/saxbookmarks/main.cpp          | 2 +-
 examples/xml/saxbookmarks/mainwindow.cpp    | 2 +-
 examples/xml/saxbookmarks/mainwindow.h      | 2 +-
 examples/xml/saxbookmarks/xbelgenerator.cpp | 2 +-
 examples/xml/saxbookmarks/xbelgenerator.h   | 2 +-
 examples/xml/saxbookmarks/xbelhandler.cpp   | 2 +-
 examples/xml/saxbookmarks/xbelhandler.h     | 2 +-
 examples/xml/streambookmarks/main.cpp       | 2 +-
 examples/xml/streambookmarks/mainwindow.cpp | 2 +-
 examples/xml/streambookmarks/mainwindow.h   | 2 +-
 examples/xml/streambookmarks/xbelreader.cpp | 2 +-
 examples/xml/streambookmarks/xbelreader.h   | 2 +-
 examples/xml/streambookmarks/xbelwriter.cpp | 2 +-
 examples/xml/streambookmarks/xbelwriter.h   | 2 +-
 examples/xml/xmlstreamlint/main.cpp         | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'examples/xml')

diff --git a/examples/xml/dombookmarks/main.cpp b/examples/xml/dombookmarks/main.cpp
index b7cafd4fda..cfcd38ecc0 100644
--- a/examples/xml/dombookmarks/main.cpp
+++ b/examples/xml/dombookmarks/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/dombookmarks/mainwindow.cpp b/examples/xml/dombookmarks/mainwindow.cpp
index 8319310d5a..3bc895f866 100644
--- a/examples/xml/dombookmarks/mainwindow.cpp
+++ b/examples/xml/dombookmarks/mainwindow.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/dombookmarks/mainwindow.h b/examples/xml/dombookmarks/mainwindow.h
index cd9137e735..d27b116909 100644
--- a/examples/xml/dombookmarks/mainwindow.h
+++ b/examples/xml/dombookmarks/mainwindow.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp
index 6586164ffc..fa55cb2586 100644
--- a/examples/xml/dombookmarks/xbeltree.cpp
+++ b/examples/xml/dombookmarks/xbeltree.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h
index 8444f5ee26..b82f3925ab 100644
--- a/examples/xml/dombookmarks/xbeltree.h
+++ b/examples/xml/dombookmarks/xbeltree.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/rsslisting/main.cpp b/examples/xml/rsslisting/main.cpp
index e41a555843..122d34c655 100644
--- a/examples/xml/rsslisting/main.cpp
+++ b/examples/xml/rsslisting/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index ea6ac72b9a..13c4f90f31 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h
index 379d273a6b..65dc80168a 100644
--- a/examples/xml/rsslisting/rsslisting.h
+++ b/examples/xml/rsslisting/rsslisting.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/main.cpp b/examples/xml/saxbookmarks/main.cpp
index b7cafd4fda..cfcd38ecc0 100644
--- a/examples/xml/saxbookmarks/main.cpp
+++ b/examples/xml/saxbookmarks/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp
index 241fde2a39..03e235f0ae 100644
--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/mainwindow.h b/examples/xml/saxbookmarks/mainwindow.h
index 2a9a42609d..e420807ed5 100644
--- a/examples/xml/saxbookmarks/mainwindow.h
+++ b/examples/xml/saxbookmarks/mainwindow.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/xbelgenerator.cpp b/examples/xml/saxbookmarks/xbelgenerator.cpp
index afe175c7f0..0ecb1d2003 100644
--- a/examples/xml/saxbookmarks/xbelgenerator.cpp
+++ b/examples/xml/saxbookmarks/xbelgenerator.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/xbelgenerator.h b/examples/xml/saxbookmarks/xbelgenerator.h
index 8e4bf7a229..acf44be059 100644
--- a/examples/xml/saxbookmarks/xbelgenerator.h
+++ b/examples/xml/saxbookmarks/xbelgenerator.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/xbelhandler.cpp b/examples/xml/saxbookmarks/xbelhandler.cpp
index 3c97877270..284465c23f 100644
--- a/examples/xml/saxbookmarks/xbelhandler.cpp
+++ b/examples/xml/saxbookmarks/xbelhandler.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/saxbookmarks/xbelhandler.h b/examples/xml/saxbookmarks/xbelhandler.h
index 17628ea67d..c5617d2553 100644
--- a/examples/xml/saxbookmarks/xbelhandler.h
+++ b/examples/xml/saxbookmarks/xbelhandler.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/main.cpp b/examples/xml/streambookmarks/main.cpp
index a77abfef1a..1baf3af175 100644
--- a/examples/xml/streambookmarks/main.cpp
+++ b/examples/xml/streambookmarks/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp
index c5697006d5..183143dc8d 100644
--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/mainwindow.h b/examples/xml/streambookmarks/mainwindow.h
index 3b7967db8f..bb30c04d91 100644
--- a/examples/xml/streambookmarks/mainwindow.h
+++ b/examples/xml/streambookmarks/mainwindow.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp
index f01b8c78eb..47c8c3d269 100644
--- a/examples/xml/streambookmarks/xbelreader.cpp
+++ b/examples/xml/streambookmarks/xbelreader.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/xbelreader.h b/examples/xml/streambookmarks/xbelreader.h
index fccd425368..80f0a28650 100644
--- a/examples/xml/streambookmarks/xbelreader.h
+++ b/examples/xml/streambookmarks/xbelreader.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/xbelwriter.cpp b/examples/xml/streambookmarks/xbelwriter.cpp
index 1b039dd9b2..3a2862a6b6 100644
--- a/examples/xml/streambookmarks/xbelwriter.cpp
+++ b/examples/xml/streambookmarks/xbelwriter.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/streambookmarks/xbelwriter.h b/examples/xml/streambookmarks/xbelwriter.h
index 8e3a4b7600..29a8b041e8 100644
--- a/examples/xml/streambookmarks/xbelwriter.h
+++ b/examples/xml/streambookmarks/xbelwriter.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/xml/xmlstreamlint/main.cpp b/examples/xml/xmlstreamlint/main.cpp
index 3a3d9b6c38..1a362f5bba 100644
--- a/examples/xml/xmlstreamlint/main.cpp
+++ b/examples/xml/xmlstreamlint/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-- 
cgit v1.2.3


From 168ebe84e7b7234a4f51e7b3b6ac4f14b6766c20 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 15:26:23 +1000
Subject: Update URL's to use new domain.

Reviewed-by: Trust Me
---
 examples/xml/dombookmarks/frank.xbel       | 4 ++--
 examples/xml/dombookmarks/jennifer.xbel    | 6 +++---
 examples/xml/saxbookmarks/frank.xbel       | 4 ++--
 examples/xml/saxbookmarks/jennifer.xbel    | 6 +++---
 examples/xml/streambookmarks/frank.xbel    | 4 ++--
 examples/xml/streambookmarks/jennifer.xbel | 8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'examples/xml')

diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel
index d6a12c68e9..4dfaa4c224 100644
--- a/examples/xml/dombookmarks/frank.xbel
+++ b/examples/xml/dombookmarks/frank.xbel
@@ -80,8 +80,8 @@
             <bookmark href="http://doc.trolltech.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qtsoftware.com/">
-                <title>Trolltech Home Page</title>
+            <bookmark href="http://qt.nokia.com/">
+                <title>Qt Home Page</title>
             </bookmark>
         </folder>
         <folder folded="yes">
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index 597880affc..dafdb67d4e 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -48,13 +48,13 @@
         <bookmark href="http://doc.trolltech.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/">
-            <title>Trolltech's home page</title>
+        <bookmark href="http://qt.nokia.com/">
+            <title>Qt home page</title>
         </bookmark>
         <bookmark href="http://doc.trolltech.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/developer/faqs/">
+        <bookmark href="http://qt.nokia.com/developer/faqs/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel
index d6a12c68e9..4dfaa4c224 100644
--- a/examples/xml/saxbookmarks/frank.xbel
+++ b/examples/xml/saxbookmarks/frank.xbel
@@ -80,8 +80,8 @@
             <bookmark href="http://doc.trolltech.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qtsoftware.com/">
-                <title>Trolltech Home Page</title>
+            <bookmark href="http://qt.nokia.com/">
+                <title>Qt Home Page</title>
             </bookmark>
         </folder>
         <folder folded="yes">
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index 597880affc..51f09966b6 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -48,13 +48,13 @@
         <bookmark href="http://doc.trolltech.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/">
-            <title>Trolltech's home page</title>
+        <bookmark href="http://qt.nokia.com/">
+            <title>qt home page</title>
         </bookmark>
         <bookmark href="http://doc.trolltech.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/developer/faqs/">
+        <bookmark href="http://qt.nokia.com/developer/faqs/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel
index d6a12c68e9..4dfaa4c224 100644
--- a/examples/xml/streambookmarks/frank.xbel
+++ b/examples/xml/streambookmarks/frank.xbel
@@ -80,8 +80,8 @@
             <bookmark href="http://doc.trolltech.com/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
-            <bookmark href="http://qtsoftware.com/">
-                <title>Trolltech Home Page</title>
+            <bookmark href="http://qt.nokia.com/">
+                <title>Qt Home Page</title>
             </bookmark>
         </folder>
         <folder folded="yes">
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index 597880affc..ea75cbcf34 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
@@ -48,13 +48,13 @@
         <bookmark href="http://doc.trolltech.com/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/">
-            <title>Trolltech's home page</title>
+        <bookmark href="http://qt.nokia.com/">
+            <title>Qt home page</title>
         </bookmark>
         <bookmark href="http://doc.trolltech.com/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
-        <bookmark href="http://qtsoftware.com/developer/faqs/">
+        <bookmark href="http://qt.nokia.com/developer/faqs/">
             <title>Frequently Asked Questions</title>
         </bookmark>
     </folder>
-- 
cgit v1.2.3


From e6b6dfb42ea4b649b52df9d17628bfdf3f9d29e4 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 15:55:39 +1000
Subject: Update references to online documentation.

Reviewed-by: Trust Me
---
 examples/xml/dombookmarks/frank.xbel       | 6 +++---
 examples/xml/dombookmarks/jennifer.xbel    | 4 ++--
 examples/xml/saxbookmarks/frank.xbel       | 6 +++---
 examples/xml/saxbookmarks/jennifer.xbel    | 4 ++--
 examples/xml/streambookmarks/frank.xbel    | 6 +++---
 examples/xml/streambookmarks/jennifer.xbel | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'examples/xml')

diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel
index 4dfaa4c224..6bd63b8b07 100644
--- a/examples/xml/dombookmarks/frank.xbel
+++ b/examples/xml/dombookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index dafdb67d4e..6cfa491e82 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel
index 4dfaa4c224..6bd63b8b07 100644
--- a/examples/xml/saxbookmarks/frank.xbel
+++ b/examples/xml/saxbookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index 51f09966b6..cd9bece363 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel
index 4dfaa4c224..6bd63b8b07 100644
--- a/examples/xml/streambookmarks/frank.xbel
+++ b/examples/xml/streambookmarks/frank.xbel
@@ -71,13 +71,13 @@
         </folder>
         <folder folded="no">
             <title>Qt</title>
-            <bookmark href="http://doc.trolltech.com/2.3/">
+            <bookmark href="http://qt.nokia.com/doc/2.3/">
                 <title>Qt 2.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/3.3/">
+            <bookmark href="http://qt.nokia.com/doc/3.3/">
                 <title>Qt 3.3 Reference</title>
             </bookmark>
-            <bookmark href="http://doc.trolltech.com/4.0/">
+            <bookmark href="http://qt.nokia.com/doc/4.0/">
                 <title>Qt 4.0 Reference</title>
             </bookmark>
             <bookmark href="http://qt.nokia.com/">
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index ea75cbcf34..36256fda0a 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -45,13 +45,13 @@
                 <title>QtQuestions</title>
             </bookmark>
         </folder>
-        <bookmark href="http://doc.trolltech.com/qq/">
+        <bookmark href="http://qt.nokia.com/doc/qq/">
             <title>Qt Quarterly</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/">
             <title>Qt home page</title>
         </bookmark>
-        <bookmark href="http://doc.trolltech.com/4.0/">
+        <bookmark href="http://qt.nokia.com/doc/4.0/">
             <title>Qt 4.0 documentation</title>
         </bookmark>
         <bookmark href="http://qt.nokia.com/developer/faqs/">
-- 
cgit v1.2.3


From 96b6a3c9cd84dbd90bd1fac84a077c01062c5871 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 16:09:25 +1000
Subject: Update obsolete URL's in code and docs.

Reviewed-by: Trust Me
---
 examples/xml/rsslisting/rsslisting.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/xml')

diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index 13c4f90f31..ff938db350 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -76,7 +76,7 @@ RSSListing::RSSListing(QWidget *parent)
     : QWidget(parent)
 {
     lineEdit = new QLineEdit(this);
-    lineEdit->setText("http://labs.trolltech.com/blogs/feed");
+    lineEdit->setText("http://labs.qt.nokia.com/blogs/feed");
 
     fetchButton = new QPushButton(tr("Fetch"), this);
     abortButton = new QPushButton(tr("Abort"), this);
-- 
cgit v1.2.3


From 1047445648b7eb5b85107c00ea43885b44f891cd Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 17:04:56 +1000
Subject: Replace some mentions of Trolltech with more appropriate terms.

Reviewed-by: Trust Me
---
 examples/xml/dombookmarks/jennifer.xbel | 2 +-
 examples/xml/saxbookmarks/jennifer.xbel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/xml')

diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index 6cfa491e82..36256fda0a 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index cd9bece363..d6a5b41d05 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
     <folder folded="no">
         <title>Qt Resources</title>
         <folder folded="yes">
-            <title>Trolltech Partners</title>
+            <title>Qt Partners</title>
             <bookmark href="http://partners.trolltech.com/partners/training.html">
                 <title>Training Partners</title>
             </bookmark>
-- 
cgit v1.2.3