summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/activeqt/simple.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/simple.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/simple.qdoc')
-rw-r--r--doc/src/examples/activeqt/simple.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/activeqt/simple.qdoc b/doc/src/examples/activeqt/simple.qdoc
index f3a187fb9..c9c77c4cd 100644
--- a/doc/src/examples/activeqt/simple.qdoc
+++ b/doc/src/examples/activeqt/simple.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$
**
****************************************************************************/
@@ -46,7 +46,7 @@
\raw HTML
<object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
- CODEBASE="http://qtsoftware.com/demos/simpleax.cab">
+ CODEBASE="http://qt.nokia.com/demos/simpleax.cab">
<PARAM NAME="text" VALUE="A simple control" />
<PARAM NAME="value" VALUE="1" />
[Object not available! Did you forget to build and register the server?]