diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index a125bc9a2ab30edc9393655bd9c6bae3862c91e1..ae5f93877c60001cd240139723b81f61def46a26 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 0a3e8d64fb896a13fbab4b656637b553069e11aa..1543082d3d7538ef4a8ab82404150a33ae73aee8 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>®</sup>" diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 46dceac44364f41c7fcb2604db7d00c01ddc827f..d9ac378b5c033b445ced0a84c25965f979ac7316 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)