diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
| commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
| tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /doc/src/distributingqt.qdoc | |
| parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
| parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src/distributingqt.qdoc')
| -rw-r--r-- | doc/src/distributingqt.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/distributingqt.qdoc b/doc/src/distributingqt.qdoc index 4ca525362..073997664 100644 --- a/doc/src/distributingqt.qdoc +++ b/doc/src/distributingqt.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$ ** ****************************************************************************/ @@ -64,13 +64,13 @@ System-specific Notes\endlink.) \tableofcontents Also see the "deployment" articles in -\e{\link http://doc.trolltech.com/qq/ Qt Quarterly\endlink}: +\e{\link http://qt.nokia.com/doc/qq/ Qt Quarterly\endlink}: \list -\i \link http://doc.trolltech.com/qq/qq09-mac-deployment.html +\i \link http://qt.nokia.com/doc/qq/qq09-mac-deployment.html Deploying Applications on Mac OS X\endlink -\i \link http://doc.trolltech.com/qq/qq10-windows-deployment.html +\i \link http://qt.nokia.com/doc/qq/qq10-windows-deployment.html Deploying Applications on Windows\endlink -\i \link http://doc.trolltech.com/qq/qq11-unix-deployment.html +\i \link http://qt.nokia.com/doc/qq/qq11-unix-deployment.html Deploying Applications on X11\endlink \endlist |