summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/activeqt/menus.qdoc
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
committerMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
commite3078a5db9e092d78813180ce077789551929e4f (patch)
treefce2a4b5607c8dc796faececf71f78ae83effe4e /doc/src/examples/activeqt/menus.qdoc
parent3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff)
parentdb0ebfd97d14bf3c537957d9642ba014318f8418 (diff)
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src/examples/activeqt/menus.qdoc')
-rw-r--r--doc/src/examples/activeqt/menus.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/activeqt/menus.qdoc b/doc/src/examples/activeqt/menus.qdoc
index a2cd58287..8214f6df7 100644
--- a/doc/src/examples/activeqt/menus.qdoc
+++ b/doc/src/examples/activeqt/menus.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$
**
****************************************************************************/
@@ -49,7 +49,7 @@
\raw HTML
<object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"
- CODEBASE="http://qtsoftware.com/demos/menusax.cab">
+ CODEBASE="http://qt.nokia.com/demos/menusax.cab">
[Object not available! Did you forget to build and register the server?]
</object>
\endraw