aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@nokia.com>2010-11-24 13:19:10 +0100
committerLeena Miettinen <riitta-leena.miettinen@nokia.com>2010-11-24 13:20:37 +0100
commit2f79abcc45f0b7c275c67b25a15e9bbe681d5f17 (patch)
tree1b41314da50ded66eb5f6f31b0d9e55c33028124
parent6b09e70831cafa1d9ad2fa652a277ac1f882f04d (diff)
Doc: change the SDK name to Nokia Qt SDK
Reviewed-by: Robert Loehning
-rw-r--r--doc/qtcreator.qdoc14
-rw-r--r--doc/qtcreator.qdocconf2
-rw-r--r--doc/symbiandev.qdoc2
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index a125bc9a2a..ae5f93877c 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -67,7 +67,7 @@
\list
\o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
- \o \l{Creating a Mobile Application with Qt SDK}
+ \o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
\o \l{Managing Projects}
@@ -2632,7 +2632,7 @@
\section3 Troubleshooting MinGW Compilation Errors
If error messages displayed in the \gui {Compile Output} pane contain
- paths where slashes are missing (for example, C:QtSDK),
+ paths where slashes are missing (for example, C:NokiaQtSDK),
check your PATH variable. At the command line, enter the following commands:
\code
@@ -3593,7 +3593,7 @@
\list
\o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
- \o \l{Creating a Mobile Application with Qt SDK}
+ \o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
@@ -3606,7 +3606,7 @@
\page creator-mobile-example.html
\nextpage creator-qml-application.html
- \title Creating a Mobile Application with Qt SDK
+ \title Creating a Mobile Application with Nokia Qt SDK
\note To complete this tutorial, you must install \QSDK.
The installation program installs and configures the necessary tool chains
@@ -3940,7 +3940,7 @@
To use the states.png image in your application, you must copy it to the project
directory from the examples directory in the
Qt installation directory. For example:
- \c {C:\QtSDK\Examples\4.7\declarative\animation\states}. The image appears
+ \c {C:\NokiaQtSDK\Examples\4.7\declarative\animation\states}. The image appears
in the \gui Resources pane. You can also use any other image or a QML element, instead.
\list 1
@@ -6182,7 +6182,7 @@
\c{PATH} environment variable to include the bin folders of \c mingw and
Qt Creator in the SDK.
- For instance, if you have the Qt Creator SDK installed in your C drive,
+ For instance, if you have the Qt SDK installed in your C drive,
use the following command to set the environment variables in
the command line prompt:
\code
@@ -8428,7 +8428,7 @@
you installed \QSDK, Qt Creator, and MADDE.
\o If error messages displayed in the \gui {Compile Output} pane contain
- paths where slashes are missing (for example, C:QtSDK),
+ paths where slashes are missing (for example, C:NokiaQtSDK),
check your PATH variable. For more information, see
\l{Troubleshooting MinGW Compilation Errors}.
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 0a3e8d64fb..1543082d3d 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -87,7 +87,7 @@ macro.QL = "\\e{Qt Linguist}"
macro.QC = "\\e{Qt Creator}"
macro.QMLD = "\\e{Qt Quick Designer}"
macro.QQV = "\\e{Qt QML Viewer}"
-macro.QSDK = "\\e{Qt SDK}"
+macro.QSDK = "\\e{Nokia Qt SDK}"
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
macro.reg.HTML = "<sup>&reg;</sup>"
diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc
index 46dceac443..d9ac378b5c 100644
--- a/doc/symbiandev.qdoc
+++ b/doc/symbiandev.qdoc
@@ -112,7 +112,7 @@
\endlist
\note If errors occur during the installation, copy the .sis files from
- \c {<QtSDK_install_path>\Symbian\sis} to the device using USB storage
+ \c {<NokiaQtSDK_install_path>\Symbian\sis} to the device using USB storage
mode. Then install them from the file manager on the device.
\if defined(qcmanual)