From 35e1b7dd8fef475a6bf7daf4067bae08dd635c11 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 11 Jul 2013 15:08:14 +0200
Subject: [PATCH] Documentation: Remove references to Nokia and obsolete
QSA-product.
Change-Id: I427e1b98fd196686f44f3862167f90252e8d665e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
.../hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc | 2 +-
.../menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc | 2 +-
examples/activeqt/menus/doc/src/menus.qdoc | 2 +-
examples/activeqt/opengl/doc/src/opengl.qdoc | 2 +-
examples/activeqt/simple/doc/src/simple.qdoc | 2 +-
src/activeqt/doc/snippets/src_activeqt_container_qaxbase.cpp | 4 ++--
src/activeqt/doc/src/examples/dotnet.qdoc | 5 ++---
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc b/examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc
index b9c65651..40d8744e 100644
--- a/examples/activeqt/hierarchy/doc/snippets/hierarchy-demo-snippet.qdoc
+++ b/examples/activeqt/hierarchy/doc/snippets/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/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc b/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
index e62213d6..d4836b20 100644
--- a/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
+++ b/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc
@@ -40,7 +40,7 @@
//! [0]
<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>
//! [0]
diff --git a/examples/activeqt/menus/doc/src/menus.qdoc b/examples/activeqt/menus/doc/src/menus.qdoc
index 64b8332e..e9ce3743 100644
--- a/examples/activeqt/menus/doc/src/menus.qdoc
+++ b/examples/activeqt/menus/doc/src/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/examples/activeqt/opengl/doc/src/opengl.qdoc b/examples/activeqt/opengl/doc/src/opengl.qdoc
index e77fca07..231ea5b3 100644
--- a/examples/activeqt/opengl/doc/src/opengl.qdoc
+++ b/examples/activeqt/opengl/doc/src/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/examples/activeqt/simple/doc/src/simple.qdoc b/examples/activeqt/simple/doc/src/simple.qdoc
index 77a45c55..0aac5f62 100644
--- a/examples/activeqt/simple/doc/src/simple.qdoc
+++ b/examples/activeqt/simple/doc/src/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/src/activeqt/doc/snippets/src_activeqt_container_qaxbase.cpp b/src/activeqt/doc/snippets/src_activeqt_container_qaxbase.cpp
index 3c2a57a8..a716bc33 100644
--- a/src/activeqt/doc/snippets/src_activeqt_container_qaxbase.cpp
+++ b/src/activeqt/doc/snippets/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]
diff --git a/src/activeqt/doc/src/examples/dotnet.qdoc b/src/activeqt/doc/src/examples/dotnet.qdoc
index 51b06328..9a2e270f 100644
--- a/src/activeqt/doc/src/examples/dotnet.qdoc
+++ b/src/activeqt/doc/src/examples/dotnet.qdoc
@@ -306,9 +306,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
--
GitLab