diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-11 15:08:14 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-30 15:08:10 +0200 |
commit | 1ac65c92ff74dc90636dc5fff0d98b73b1c1ae87 (patch) | |
tree | 9fbb4cf04c60c7d4011d7e0ab72b0f164ad52832 /doc | |
parent | 2fa5a8daaf809403aba3f079ce6d11d29a6b6060 (diff) |
Documentation: Remove references to Nokia and obsolete QSA-product.
Change-Id: I427e1b98fd196686f44f3862167f90252e8d665e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
(cherry picked from qtactiveqt/35e1b7dd8fef475a6bf7daf4067bae08dd635c11)
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/examples/activeqt/dotnet.qdoc | 5 | ||||
-rw-r--r-- | doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc | 2 | ||||
-rw-r--r-- | doc/src/examples/activeqt/menus.qdoc | 2 | ||||
-rw-r--r-- | doc/src/examples/activeqt/opengl.qdoc | 2 | ||||
-rw-r--r-- | doc/src/examples/activeqt/simple.qdoc | 2 | ||||
-rw-r--r-- | doc/src/snippets/code/src_activeqt_container_qaxbase.cpp | 4 |
6 files changed, 8 insertions, 9 deletions
diff --git a/doc/src/examples/activeqt/dotnet.qdoc b/doc/src/examples/activeqt/dotnet.qdoc index ff11280468..aa88d828f6 100644 --- a/doc/src/examples/activeqt/dotnet.qdoc +++ b/doc/src/examples/activeqt/dotnet.qdoc @@ -310,9 +310,8 @@ since this includes subclasses of QObject and QWidget we can wrap any of our datatypes into a QObject subclass to make its API available to .NET. This has the positive side effect that the same - API is automatically available in - \l{http://qt.nokia.com/products/qsa/}{QSA}, the cross platform - scripting solution for Qt applications, and to COM clients in general. + API is automatically available when using \l QtScript to automate + Qt applications and to COM clients in general. When using the "IJW" method, in principle the only limitation is the time required to write the wrapper classes and data type conversion diff --git a/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc b/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc index b9c6565198..40d8744e0e 100644 --- a/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc +++ b/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc @@ -53,7 +53,7 @@ function setFont( form ) This widget can have many children! </p> <object ID="ParentWidget" CLASSID="CLSID:d574a747-8016-46db-a07c-b2b4854ee75c" -CODEBASE="http://qt.nokia.com/demos/hierarchy.cab"> +CODEBASE="http://www.qt-project.org/demos/hierarchy.cab"> [Object not available! Did you forget to build and register the server?] </object><br /> <form> diff --git a/doc/src/examples/activeqt/menus.qdoc b/doc/src/examples/activeqt/menus.qdoc index 4fa9fb8541..4d8f4829e9 100644 --- a/doc/src/examples/activeqt/menus.qdoc +++ b/doc/src/examples/activeqt/menus.qdoc @@ -35,7 +35,7 @@ \raw HTML <object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd" - CODEBASE="http://qt.nokia.com/demos/menusax.cab"> + CODEBASE="http://www.qt-project.org/demos/menusax.cab"> [Object not available! Did you forget to build and register the server?] </object> \endraw diff --git a/doc/src/examples/activeqt/opengl.qdoc b/doc/src/examples/activeqt/opengl.qdoc index e265b4b41a..2fb419b9e5 100644 --- a/doc/src/examples/activeqt/opengl.qdoc +++ b/doc/src/examples/activeqt/opengl.qdoc @@ -43,7 +43,7 @@ <p /> An OpenGL scene:<br /> <object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0" - CODEBASE="http://qt.nokia.com/demos/openglax.cab"> + CODEBASE="http://www.qt-project.org/demos/openglax.cab"> [Object not available! Did you forget to build and register the server?] </object><br /> diff --git a/doc/src/examples/activeqt/simple.qdoc b/doc/src/examples/activeqt/simple.qdoc index 193e947d64..e5d016f39b 100644 --- a/doc/src/examples/activeqt/simple.qdoc +++ b/doc/src/examples/activeqt/simple.qdoc @@ -32,7 +32,7 @@ \raw HTML <object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669" - CODEBASE="http://qt.nokia.com/demos/simpleax.cab"> + CODEBASE="http://www.qt-project.org/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?] diff --git a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp index 3c2a57a8c8..a716bc3359 100644 --- a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp +++ b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp @@ -145,12 +145,12 @@ ctrl->setControl("DOMAIN/user:password@server/{8E27C92B-1264-101C-8A2F-040224009 //! [15] -activeX->dynamicCall("Navigate(const QString&)", "qt.nokia.com"); +activeX->dynamicCall("Navigate(const QString&)", "www.qt-project.org"); //! [15] //! [16] -activeX->dynamicCall("Navigate(\"qt.nokia.com\")"); +activeX->dynamicCall("Navigate(\"www.qt-project.org\")"); //! [16] |