summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@nokia.com>2010-03-04 17:40:22 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-03-05 11:41:28 (GMT)
commitcc0502986743c6c56dee5980b763aff0e3f025ef (patch)
treeec45e6ccbe84b49248c5ba0ea6a1e8fdc83ecf3e
parent49b753a971aaaebc19ed619282d54677a1aa6276 (diff)
downloadQt-cc0502986743c6c56dee5980b763aff0e3f025ef.zip
Qt-cc0502986743c6c56dee5980b763aff0e3f025ef.tar.gz
Qt-cc0502986743c6c56dee5980b763aff0e3f025ef.tar.bz2
Updated URLs.
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com> (cherry picked from commit 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd)
-rw-r--r--dist/changes-4.5.42
-rw-r--r--dist/changes-4.7.04
-rw-r--r--doc/src/declarative/basictypes.qdoc2
-rw-r--r--tools/qdoc3/test/qml.qdocconf2
4 files changed, 5 insertions, 5 deletions
diff --git a/dist/changes-4.5.4 b/dist/changes-4.5.4
index abaf4f0..e60e507 100644
--- a/dist/changes-4.5.4
+++ b/dist/changes-4.5.4
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.com/developer/task-tracker
+ http://qt.nokia.com/developer/task-tracker
Each of these identifiers can be entered in the task tracker to obtain more
information about a particular change.
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 013f1ce..9cb9966 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -2,7 +2,7 @@ Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:
- http://doc.trolltech.com/4.7
+ http://qt.nokia.com/doc/4.7
The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.
@@ -10,7 +10,7 @@ Applications compiled for 4.6 will continue to run with 4.7.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.com/developer/task-tracker
+ http://qt.nokia.com/developer/task-tracker
Each of these identifiers can be entered in the task tracker to obtain more
information about a particular change.
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index c60847e..6901947 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -128,7 +128,7 @@
\brief A URL is a resource locator, like a file name.
A URL is a resource locator, like a file name. It can be either
- absolute, e.g. "http://qtsoftware.com", or relative, e.g.
+ absolute, e.g. "http://qt.nokia.com", or relative, e.g.
"pics/logo.png". A relative URL is resolved relative to the URL of
the component where the URL is converted from a JavaScript string
expression to a url property value.
diff --git a/tools/qdoc3/test/qml.qdocconf b/tools/qdoc3/test/qml.qdocconf
index 3b5d8dc..e5b883a 100644
--- a/tools/qdoc3/test/qml.qdocconf
+++ b/tools/qdoc3/test/qml.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
project = Qml
description = Qml Reference Documentation
-url = http://doc.qtsoftware.com/4.6
+url = http://qt.nokia.com/doc/4.6/
qmlonly = true
edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \