summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 20:47:48 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 20:47:48 +1000
commit0d8a2f0e2692a0b8bce66d44d9f7ca0100e7f7e7 (patch)
tree2c454df4c9f90dcc4982cb09e6d0694d91925445
parentd03b66ebbda95a91aced5d2b9173fa385d1cdcb1 (diff)
Update URL for Qt Labs.
Reviewed-by: Trust Me
-rw-r--r--demos/browser/data/defaultbookmarks.xbel2
-rw-r--r--doc/src/trolltech-webpages.qdoc8
-rw-r--r--examples/xml/rsslisting/rsslisting.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
index fd9c4a5881..1d20ac0880 100644
--- a/demos/browser/data/defaultbookmarks.xbel
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -15,7 +15,7 @@
<bookmark href="http://qt.nokia.com/doc/qq/">
<title>Qt Quarterly</title>
</bookmark>
- <bookmark href="http://labs.trolltech.com/">
+ <bookmark href="http://labs.qt.nokia.com/">
<title>Qt Labs</title>
</bookmark>
<bookmark href="http://www.qtcentre.org/">
diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc
index 9d876b66ba..283f2234eb 100644
--- a/doc/src/trolltech-webpages.qdoc
+++ b/doc/src/trolltech-webpages.qdoc
@@ -195,22 +195,22 @@
*/
/*!
- \externalpage http://labs.trolltech.com/page/Projects/Itemview/Modeltest
+ \externalpage http://labs.qt.nokia.com/page/Projects/Itemview/Modeltest
\title ModelTest
*/
/*!
- \externalpage http://labs.trolltech.com/page/Projects/Accessibility/QDBusBridge
+ \externalpage http://labs.qt.nokia.com/page/Projects/Accessibility/QDBusBridge
\title D-Bus Accessibility Bridge
*/
/*!
- \externalpage http://labs.trolltech.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
+ \externalpage http://labs.qt.nokia.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
\title qtestlib-tools Announcement
*/
/*!
- \externalpage http://labs.trolltech.com/gitweb?p=qtestlib-tools;a=summary
+ \externalpage http://labs.qt.nokia.com/gitweb?p=qtestlib-tools;a=summary
\title qtestlib-tools
*/
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);