diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/qtcreator.qdoc | 14 | ||||
-rw-r--r-- | doc/qtcreator.qdocconf | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 4822b60380..f56a9a377f 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 Nokia Qt SDK} + \o \l{Creating a Mobile Application with Qt SDK} \o \l{Creating a Qt Quick Application} \endlist \o \l{Managing Projects} @@ -2950,7 +2950,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:NokiaQtSDK), + paths where slashes are missing (for example, C:QtSDK), check your PATH variable. At the command line, enter the following commands: \code @@ -4163,7 +4163,7 @@ \note The instructions below assume that you have installed \QSDK. \o To package Nokia Smart Installer for Symbian with the application, choose - \gui {Start > Nokia Qt SDK > Symbian > Qt for Symbian Command Prompt} + \gui {Start > Qt SDK > Symbian > Qt for Symbian Command Prompt} to open the Qt command line environment. \o Change to the project directory. For example: @@ -4435,7 +4435,7 @@ \list \o \l{Building and Running an Example Application} \o \l{Creating a Qt C++ Application} - \o \l{Creating a Mobile Application with Nokia Qt SDK} + \o \l{Creating a Mobile Application with Qt SDK} \o \l{Creating a Qt Quick Application} \endlist @@ -4448,7 +4448,7 @@ \page creator-mobile-example.html \nextpage creator-qml-application.html - \title Creating a Mobile Application with Nokia Qt SDK + \title Creating a Mobile Application with Qt SDK \note To complete this tutorial, you must install \QSDK. The installation program installs and configures the necessary tool chains @@ -4783,7 +4783,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:\NokiaQtSDK\Examples\4.7\declarative\animation\states}. The image appears + \c {C:\QtSDK\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 @@ -9499,7 +9499,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:NokiaQtSDK), + paths where slashes are missing (for example, C:QtSDK), check your PATH variable. For more information, see \l{Troubleshooting MinGW Compilation Errors}. diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 4ade11b3c4..78d016d9a7 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{Nokia Qt SDK}" +macro.QSDK = "\\e{Qt SDK}" macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.reg.HTML = "<sup>®</sup>" |