diff options
author | mread <qt-info@nokia.com> | 2009-08-19 08:49:35 (GMT) |
---|---|---|
committer | mread <qt-info@nokia.com> | 2009-08-19 08:49:35 (GMT) |
commit | c162acb326cdd53b080c99a75f91d5e8fd4a84be (patch) | |
tree | 08bfbb1c23b4032e27534ef2e75e981f3a8326ec /doc/src | |
parent | 9addeea6f35a7f1b1c20d818dd022ed64086a6a2 (diff) | |
parent | 3ae4ebe921a318ba4474a6b0b9d76b1795d0719d (diff) | |
download | Qt-c162acb326cdd53b080c99a75f91d5e8fd4a84be.zip Qt-c162acb326cdd53b080c99a75f91d5e8fd4a84be.tar.gz Qt-c162acb326cdd53b080c99a75f91d5e8fd4a84be.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/examples/htmlinfo.qdoc | 2 | ||||
-rw-r--r-- | doc/src/exceptionsafety.qdoc | 2 | ||||
-rw-r--r-- | doc/src/s60-introduction.qdoc | 2 | ||||
-rw-r--r-- | doc/src/symbian-exceptionsafety.qdoc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/examples/htmlinfo.qdoc b/doc/src/examples/htmlinfo.qdoc index e2be964..68e8320 100644 --- a/doc/src/examples/htmlinfo.qdoc +++ b/doc/src/examples/htmlinfo.qdoc @@ -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/doc/src/exceptionsafety.qdoc b/doc/src/exceptionsafety.qdoc index 1378f24..284159f 100644 --- a/doc/src/exceptionsafety.qdoc +++ b/doc/src/exceptionsafety.qdoc @@ -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/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc index 16919cb..24f7817 100644 --- a/doc/src/s60-introduction.qdoc +++ b/doc/src/s60-introduction.qdoc @@ -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/doc/src/symbian-exceptionsafety.qdoc b/doc/src/symbian-exceptionsafety.qdoc index cb6d5ff..9183ba7 100644 --- a/doc/src/symbian-exceptionsafety.qdoc +++ b/doc/src/symbian-exceptionsafety.qdoc @@ -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$ ** ****************************************************************************/ |