diff options
author | Leena Miettinen <[email protected]> | 2012-10-22 15:03:38 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2012-10-22 15:38:53 +0200 |
commit | 8b8d104c580b316639d5bf8109c765b161608e19 (patch) | |
tree | 01cce7084443de749d8749eb98bd6f5952c9cea1 /doc/src/linux-mobile | |
parent | 1ac3850c6f7c3e466c9eda7f86f88ecba4f7c42c (diff) |
Doc: where appropriate, refer to Qt 4 SDK
The contents of the Qt 5 installation program will differ from those
of the previous Qt SDK (no tool chains for Nokia mobile devices, for
example). To make this clear, refer to the Qt 4 SDK, where appropriate.
Change-Id: Ia6c3ab5fc3edd150fbe5362f85353243860afdb7
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'doc/src/linux-mobile')
-rw-r--r-- | doc/src/linux-mobile/creator-madde-emulator.qdoc | 2 | ||||
-rw-r--r-- | doc/src/linux-mobile/maemodev.qdoc | 18 | ||||
-rw-r--r-- | doc/src/linux-mobile/meegodev.qdoc | 18 |
3 files changed, 19 insertions, 19 deletions
diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc index e0557d74289..b98d0b25d2f 100644 --- a/doc/src/linux-mobile/creator-madde-emulator.qdoc +++ b/doc/src/linux-mobile/creator-madde-emulator.qdoc @@ -31,7 +31,7 @@ \title Using Maemo or MeeGo Harmattan Emulator The Maemo 5 (Fremantle) and MeeGo Harmattan emulator are installed as part - of the \QSDK. After they are installed, you can start them from \QC. + of the Qt 4 SDK. After they are installed, you can start them from \QC. The Maemo 5 emulator emulates the Nokia N900 device environment. You can test applications in conditions practically identical to running the diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc index aeff92101bf..51957fa4dbf 100644 --- a/doc/src/linux-mobile/maemodev.qdoc +++ b/doc/src/linux-mobile/maemodev.qdoc @@ -34,7 +34,7 @@ applications using the Qt framework. You can install the whole tool chain that you need to create, build, debug, run, and deploy Maemo 5 applications as a part of the custom installation - in the \QSDK online installer. + in the Qt 4 SDK online installer. \if defined(qcmanual) For more @@ -56,14 +56,14 @@ (V20.2010.36-2) or later installed. \if defined(qcmanual) \o MADDE cross-platform Maemo development - tool (installed as part of the \QSDK). + tool (installed as part of the Qt 4 SDK). \endif \o Nokia USB drivers. Only needed if you develop on Windows and if you use a USB connection to run applications on the device. The drivers are - installed as part of the \QSDK. You can also download them from + installed as part of the Qt 4 SDK. You can also download them from \l{https://garage.maemo.org/frs/?group_id=801&release_id=2655}{PC Connectivity} on the Maemo web site. Download and install the latest PC_Connectivity_<version>.exe (at the time of writing, @@ -216,7 +216,7 @@ To be able to run and debug applications on the Maemo emulator and devices, you must set up connections to the emulator and - devices in the \QC build and run settings. If you install \QSDK, the + devices in the \QC build and run settings. If you install Qt 4 SDK, the connection to the emulator is configured automatically and you only need to configure a connection to the device. @@ -309,7 +309,7 @@ \o To test applications on the emulator (QEMU) separately, you must create a connection to it from the development PC. If you installed - \QSDK, the connection is created automatically and you can omit this + Qt 4 SDK, the connection is created automatically and you can omit this step. \list a @@ -340,24 +340,24 @@ above. \o In the \gui Sysroot field, specify the path to the sysroot. - By default, the \QSDK installer places sysroot in the + By default, the Qt 4 SDK installer places sysroot in the following folder: \c{QtSDK\Maemo\4.6.2\sysroots\fremantle-arm-sysroot-20.2010.36-2-slim}. \o In the \gui {Compiler type} field, select GCC. \o In the \gui Compiler field, specify the path to the GCC - compiler. By default, the \QSDK installer places the + compiler. By default, the Qt 4 SDK installer places the compiler in the following folder: \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. \o In the \gui Debugger field, specify the path to GDB. By - default, the \QSDK installer places the debugger + default, the Qt 4 SDK installer places the debugger in the following folder: \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. \o In the \gui {Qt version} field, choose the MADDE Qt version - for Maemo5/Fremantle. By default, the \QSDK installer + for Maemo5/Fremantle. By default, the Qt 4 SDK installer places qmake in the following folder: \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}. diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc index 215a50f40ff..df246d30f23 100644 --- a/doc/src/linux-mobile/meegodev.qdoc +++ b/doc/src/linux-mobile/meegodev.qdoc @@ -33,7 +33,7 @@ mobile devices. It allows developers to create applications using the Qt framework. You can install and configure the whole tool chain that you need to create, build, debug, run, and deploy Harmattan applications as part of - the \QSDK. + the Qt 4 SDK. \if defined(qcmanual) For more information about the Harmattan platform, see @@ -42,7 +42,7 @@ \endif - \note \QSDK does not contain the tool chains for building applications for + \note Qt 4 SDK does not contain the tool chains for building applications for other MeeGo devices than MeeGo Harmattan. You can try to run applications from \QC on other MeeGo devices, but it has not been extensively tested, and the instructions might not always apply. @@ -191,7 +191,7 @@ If you develop on Windows XP and use a USB connection to run applications on the device, you need the Nokia USB drivers that are installed as part of the - \QSDK. + Qt 4 SDK. When you connect the device to your Windows PC, Windows tries to install a driver for the Linux USB Ethernet connection. In the @@ -229,7 +229,7 @@ To be able to run and debug applications on the emulator and devices, you must set up connections to the emulator and devices in the \QC build - and run settings. If you install \QSDK, the connection to the emulator is + and run settings. If you install Qt 4 SDK, the connection to the emulator is configured automatically and you only need to configure a connection to the device. @@ -324,7 +324,7 @@ \o To test applications on the emulator (QEMU), you must create a connection to it from the development PC. If you installed - \QSDK, the connection is created automatically and you can omit this + Qt 4 SDK, the connection is created automatically and you can omit this step. \list a @@ -365,24 +365,24 @@ above. \o In the \gui Sysroot field, specify the path to the sysroot. - By default, the \QSDK installer places sysroot in the + By default, the Qt 4 SDK installer places sysroot in the following folder: \c{QtSDK\Madde\bin\sysroots\harmattan_sysroot_10.2011.34-1_slim}. \o In the \gui {Compiler type} field, select GCC. \o In the \gui Compiler field, specify the path to the GCC - compiler. By default, the \QSDK installer places the + compiler. By default, the Qt 4 SDK installer places the compiler in the following folder: \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. \o In the \gui Debugger field, specify the path to GDB. By - default, the \QSDK installer places the debugger + default, the Qt 4 SDK installer places the debugger in the following folder: \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. \o In the \gui {Qt version} field, choose the MADDE Qt version - for MeeGo 1.2 Harmattan. By default, the \QSDK installer + for MeeGo 1.2 Harmattan. By default, the Qt 4 SDK installer places qmake in the following folder: \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}. |