summaryrefslogtreecommitdiffstats
path: root/doc/src/index.qdoc
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-13 04:37:41 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-13 04:37:41 (GMT)
commitefe66141d535d1741f302efff9248db726cd66b1 (patch)
treea495722170c03ab9ee27b9cdc347c13a9d9e61f3 /doc/src/index.qdoc
parent89a2087b7ec5e36f7f4dd16d942aa23d2c7a6042 (diff)
parent07d2ce1e6df9f2b5b9c3263741f9a8f160cdbc80 (diff)
downloadQt-efe66141d535d1741f302efff9248db726cd66b1.zip
Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.gz
Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
Diffstat (limited to 'doc/src/index.qdoc')
-rw-r--r--doc/src/index.qdoc22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index b59523e..bbb6bfa 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.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$
**
****************************************************************************/
@@ -110,8 +110,8 @@
</td>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/products">About Qt</a></li>
- <li><a href="http://www.qtsoftware.com/about">About Us</a></li>
+ <li><a href="http://qt.nokia.com/products">About Qt</a></li>
+ <li><a href="http://qt.nokia.com/about">About Us</a></li>
<li><a href="commercialeditions.html">Commercial Edition</a></li>
<li><a href="opensourceedition.html">Open Source Edition</a></li>
<li><a href="supported-platforms.html">Supported Platforms</a></li>
@@ -119,11 +119,11 @@
</td>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/developer/faqs/">Frequently Asked Questions</a></li>
- <li><a href="http://www.qtsoftware.com/developer/community/">Qt Community Web Sites</a></li>
- <li><a href="http://doc.trolltech.com/qq/">Qt Quarterly</a></li>
+ <li><a href="http://qt.nokia.com/developer/faqs/">Frequently Asked Questions</a></li>
+ <li><a href="http://qt.nokia.com/developer/community/">Qt Community Web Sites</a></li>
+ <li><a href="http://qt.nokia.com/doc/qq/">Qt Quarterly</a></li>
<li><a href="bughowto.html">How to Report a Bug</a></li>
- <li><a href="http://www.qtsoftware.com/developer/">Other Online Resources</a></li>
+ <li><a href="http://qt.nokia.com/developer/">Other Online Resources</a></li>
</ul>
</td>
</tr>
@@ -208,11 +208,11 @@
<tr>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li>
- <li><a href="http://www.qtsoftware.com/products/appdev">Partner Add-ons</a></li>
+ <li><a href="http://qt.nokia.com/products/add-on-products">Qt Solutions</a></li>
+ <li><a href="http://qt.nokia.com/products/appdev">Partner Add-ons</a></li>
<li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li>
- <li><a href="http://www.qtsoftware.com/support-services/support-services/">Support</a></li>
- <li><a href="http://www.qtsoftware.com/support-services/training/">Training</a></li>
+ <li><a href="http://qt.nokia.com/support-services/support-services/">Support</a></li>
+ <li><a href="http://qt.nokia.com/support-services/training/">Training</a></li>
</ul>
</td>
<td valign="top">