diff --git a/doc/images/qtcreator-dev-conf-maemo.png b/doc/images/qtcreator-dev-conf-maemo.png
index 27330898ec0704388c12bb37e3daa90c80e0ba3e..ded44fecb44f34accccfd93db5a262d8e5b40656 100644
Binary files a/doc/images/qtcreator-dev-conf-maemo.png and b/doc/images/qtcreator-dev-conf-maemo.png differ
diff --git a/doc/images/qtcreator-linux-device-configurations.png b/doc/images/qtcreator-linux-device-configurations.png
index 23f284726e384815d61675fc49574630839f68d3..139123b67f5146283c298d59f8dd93b194a2db1d 100644
Binary files a/doc/images/qtcreator-linux-device-configurations.png and b/doc/images/qtcreator-linux-device-configurations.png differ
diff --git a/doc/images/qtcreator-maemo-device-configurations.png b/doc/images/qtcreator-maemo-device-configurations.png
index 734f6fae4bace0e39db0b80ca3a5a117b5b5d07e..f3c9372bb81edb05e4676def3bc309f4661162e4 100644
Binary files a/doc/images/qtcreator-maemo-device-configurations.png and b/doc/images/qtcreator-maemo-device-configurations.png differ
diff --git a/doc/images/qtcreator-maemo-emulator-connection.png b/doc/images/qtcreator-maemo-emulator-connection.png
deleted file mode 100644
index d33b16ed88304851878389abd1f897d8697c61eb..0000000000000000000000000000000000000000
Binary files a/doc/images/qtcreator-maemo-emulator-connection.png and /dev/null differ
diff --git a/doc/images/qtcreator-meego-device-configurations.png b/doc/images/qtcreator-meego-device-configurations.png
index 85203b4b3597a850ded899985a94772ab6d849ef..aec04dfa3dc1fcd612b9b47b0097a30c1cfdf752 100644
Binary files a/doc/images/qtcreator-meego-device-configurations.png and b/doc/images/qtcreator-meego-device-configurations.png differ
diff --git a/doc/images/qtcreator-meego-emulator-connection.png b/doc/images/qtcreator-meego-emulator-connection.png
deleted file mode 100644
index 10e0b1a76db3b13794e56dfbe5d65c18fb5224ba..0000000000000000000000000000000000000000
Binary files a/doc/images/qtcreator-meego-emulator-connection.png and /dev/null differ
diff --git a/doc/images/qtcreator-screenshot-devconf.png b/doc/images/qtcreator-screenshot-devconf.png
index 5457b5111f12a37390cdae640635f4a40f37b72a..7032513fdf8492020b22b1af6af7c2a468834f09 100644
Binary files a/doc/images/qtcreator-screenshot-devconf.png and b/doc/images/qtcreator-screenshot-devconf.png differ
diff --git a/doc/src/linux-mobile/linuxdev-keys.qdocinc b/doc/src/linux-mobile/linuxdev-keys.qdocinc
index dafc5d4d2323cfff144e279ef4951c29110f9cc7..8bfd0f3379cf41a255071706f1c62e9c8f70dd40 100644
--- a/doc/src/linux-mobile/linuxdev-keys.qdocinc
+++ b/doc/src/linux-mobile/linuxdev-keys.qdocinc
@@ -10,8 +10,7 @@
\list 1
- \o Select \gui {Tools > Options > Linux Devices > Device
- Configurations > Generate SSH Key}.
+ \o Select \gui Tools > \gui Options > \gui Devices > \gui {Create New}.
\image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
diff --git a/doc/src/linux-mobile/linuxdev-processes.qdocinc b/doc/src/linux-mobile/linuxdev-processes.qdocinc
index 856040efd15966776c20a1b9c296c06dffec3671..a0fb08553a068c01832da76c257c3732f0cf10e9 100644
--- a/doc/src/linux-mobile/linuxdev-processes.qdocinc
+++ b/doc/src/linux-mobile/linuxdev-processes.qdocinc
@@ -1,13 +1,12 @@
\section2 Managing Device Processes
You can view processes running on devices and kill them. Select
- \gui {Tools > Options > Linux Devices > Device Configurations >
- Remote Processes}.
+ \gui Tools > \gui Options > \gui Devices > \gui {Remote Processes}.
- You can filter the processes by name in the \gui {List of Remote Processes}
+ You can filter the processes by name in the \gui {List of Processes}
dialog.
To update the process list, select \gui {Update List}.
To kill a process, select it in the list, and then select \gui {Kill
- Selected Process}.
+ Process}.
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index b215ecc7d8bf2c36445ba4f22cedbf51cb04914d..4849bad31a20f83eb83ffd20eb7983f9340e209c 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -39,7 +39,7 @@
create device configurations and select them in the \QC \l{glossary-buildandrun-kit}{kit}
You use a wizard to create the connections. You can edit the settings later
- in \gui {Tools > Options > Devices > Devices}.
+ in \gui Tools > \gui Options > \gui Devices.
\image qtcreator-linux-device-configurations.png "Devices dialog"
@@ -67,8 +67,8 @@
\list 1
- \o Select \gui {Tools > Options > Linux Devices > Devices > Add
- > Generic Linux Device > Start Wizard}.
+ \o Select \gui Tools > \gui Options > \gui Devices > \gui Add
+ > \gui {Generic Linux Device} > \gui {Start Wizard}.
\image qtcreator-screenshot-devconf-linux.png "Connection Data wizard"
@@ -103,13 +103,12 @@
\o Open a project for an application you want to develop for the
device.
- \o Select \gui {Projects > Build & Run Settings > Add Kit}.
-
- \o Select the kit that you added above.
+ \o Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+ add the kit that you specified above.
\endlist
- \o To specify run settings, select \gui Run.
+ \o Select \gui Run to specify run settings.
\image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices"
diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc
index e54f58c6d4a9c2cb73bae39a8f3a0a7fef92dc81..a34a6563e257d6f10439e3ddf92bd468f5128207 100644
--- a/doc/src/linux-mobile/maemodev.qdoc
+++ b/doc/src/linux-mobile/maemodev.qdoc
@@ -48,7 +48,7 @@
or see
\l{http://doc.qt.nokia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}.
- \section1 Hardware and Software Requirements for Maemo Target
+ \section1 Hardware and Software Requirements for Maemo Devices
To build and run Qt applications for Maemo 5, you need the following:
\list
@@ -222,7 +222,7 @@
only need to configure a connection to the device.
You use a wizard to create the connections. You can edit the settings later
- in \gui {Tools > Options > Linux Devices > Device Configurations}.
+ in \gui Tools > \gui Options > \gui Devices.
\image qtcreator-maemo-device-configurations.png "Maemo Device Configurations dialog"
@@ -282,21 +282,15 @@
\note If you experience connection problems due to a USB port issue,
switch to a different port or use WLAN to connect to the device.
- \o Select \gui {Tools > Options > Linux Devices > Device
- Configurations > Add}.
+ \o Select \gui Tools > \gui Options > \gui Devices > \gui Add.
- \o Select \gui {Device with MADDE support (Fremantle, Harmattan,
- MeeGo) > Start Wizard}, and add a new configuration for a
- hardware device.
+ \o Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
\image qtcreator-dev-conf-maemo.png "Maemo device configuration"
\o In the \gui {The name to identify this configuration} field,
enter a name for the connection.
- \o In the \gui {The system running on the device} field, select
- the software platform of the device.
-
\o In the \gui {The kind of device} field, select
\gui {Hardware device}.
@@ -321,21 +315,11 @@
\list a
- \o In \QC, select \gui {Tools > Options > Linux
- Devices > Device Configurations > Add} to add a new
- configuration.
-
- \image qtcreator-maemo-emulator-connection.png "Maemo emulator configuration"
-
- \o In the \gui {The name to identify this configuration} field,
- enter a name for
- the connection.
-
- \o In the \gui {The system running on the device} field, select
- the software platform to emulate.
+ \o In \QC, select \gui Tools > \gui Options > \gui Devices >
+ \gui Add to add a new configuration.
\o In the \gui {The kind of device} field, select
- \gui {Emulator (Qemu)}.
+ \gui Emulator.
\o Click \gui Next.
@@ -345,30 +329,56 @@
\endlist
\endif
- \o To specify build and run settings:
+ \o Select \gui Tools > \gui Options > \gui {Build & Run} >
+ \gui Kits > \gui Add to add a kit for building for the device:
\list a
- \o Open a project for an application you want to develop for your
- device.
+ \o In the \gui {Device type} field, select
+ \gui {Maemo5/Fremantle}.
+
+ \o In the \gui Device field, select the device that you added
+ above.
+
+ \o In the \gui Sysroot field, specify the path to the sysroot.
+ By default, the \QSDK installer places sysroot in the
+ following folder:
+ \c{QtSDK\Maemo\4.6.2\sysroots\fremantle-arm-sysroot-20.2010.36-2-slim}.
- \o Click \gui Projects to open the projects mode.
+ \o In the \gui {Compiler type} field, select GCC.
- \o In the \gui{Build Settings} section, choose the MADDE Qt version
- that was registered by the installation program.
+ \o In the \gui Compiler field, specify the path to the GCC
+ compiler. By default, the \QSDK installer places the
+ compiler in the following folder:
+ \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}.
- \image qtcreator-build-settings-maemo.png "Maemo build settings"
+ \o In the \gui Debugger field, specify the path to GDB. By
+ default, the \QSDK 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
+ places qmake in the following folder:
+ \c{QtSDK\Maemo\4.6.2\targets\fremantle-pr13\bin\}.
+
+ \endlist
+
+ You can leave the \gui {Qt mkspec} field empty.
+
+ \o Open a project for an application you want to develop for your
+ device.
- \o In the \gui{Run Settings} section, in the
- \gui {Device configuration} field, select the device
- connection or the emulator connection.
- \image qtcreator-run-settings-maemo.png "Maemo run settings"
+ \o Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+ add the kit that you specified above.
- \o Click \gui {<no target path set>} in \gui {Remote Directory}
- to specify the folder where the file is installed on the device.
- For example, \c {/opt/usr/bin}.
+ \o Select \gui Run to specify run settings for the project.
- \endlist
+ \o The mobile application wizard automatically sets the folder
+ where the file is installed on the device in the \gui {Remote
+ Directory} field. For example, \c {/opt/usr/bin}. If the text
+ \gui {<no target path set>} is displayed, click it to specify a
+ folder.
\endlist
@@ -386,8 +396,7 @@
\o To specify the password, enter the following command:
\c{/usr/lib/mad-developer/devrootsh passwd user}
- \o In \QC, select \gui {Tools > Options Linux Devices >
- Device Configurations}.
+ \o In \QC, select \gui Tools > \gui Options > \gui Devices.
\o Specify the username \c user and the password in the device
configuration.
diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc
index 9e0d7c3c5af1b62848f162cd33c7cf80a0c5b62d..a1f5995d69e41e59447082352ae4c0bd0f4aa372 100644
--- a/doc/src/linux-mobile/meegodev.qdoc
+++ b/doc/src/linux-mobile/meegodev.qdoc
@@ -235,7 +235,7 @@
device.
You use a wizard to create the connections. You can edit the settings later
- in \gui {Tools > Options > Linux Devices > Device Configurations}.
+ in \gui Tools > \gui Options > \gui Devices.
\image qtcreator-meego-device-configurations.png "MeeGo Device Configurations dialog"
@@ -294,21 +294,16 @@
port issue, switch to a different port or use WLAN to
connect to the device.
- \o Select \gui {Tools > Options > Linux Devices > Device
- Configurations > Add}.
+ \o Select \gui Tools > \gui Options > \gui Devices > \gui Add.
- \o Select \gui {Device with MADDE support (Fremantle, Harmattan,
- MeeGo) > Start Wizard}, and add a new configuration for a
- hardware device.
+ \o Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard} to
+ add a new configuration for a device.
\image qtcreator-screenshot-devconf.png
\o In the \gui {The name to identify this configuration} field,
enter a name for the connection.
- \o In the \gui {The system running on the device} field, select
- the software platform of the device.
-
\o In the \gui {The kind of device} field, select
\gui {Hardware device}.
@@ -322,7 +317,7 @@
\o Click \gui Next.
\o Follow the instructions of the wizard to create the
- connection.
+ configuration.
\endlist
@@ -335,20 +330,16 @@
\list a
- \o In \QC, select \gui {Tools > Options > Linux
- Devices > Device Configurations > Add} to add a new
- configuration.
+ \o In \QC, select \gui Tools > \gui Options > \gui Devices >
+ \gui Add to add a new configuration.
- \image qtcreator-meego-emulator-connection.png
+ \o Select \gui {MeeGo 1.2 Harmattan} > \gui {Start Wizard}.
\o In the \gui {The name to identify this configuration} field,
enter a name for the connection.
- \o In the \gui {The system running on the device} field, select
- the software platform to emulate.
-
\o In the \gui {The kind of device} field, select
- \gui {Emulator (Qemu)}.
+ \gui Emulator.
\o Click \gui Next.
@@ -356,35 +347,59 @@
connection.
SDK Connectivity is not needed for emulator connections, and
- therefore, you do nt need to authenticate the emulator
+ therefore, you do not need to authenticate the emulator
connection.
\endlist
\endif
- \o To specify build and run settings:
+ \o Select \gui Tools > \gui Options > \gui {Build & Run} >
+ \gui Kits > \gui Add to add a kit for building for the device:
- \list a
+ \list a
- \o Open a project for an application you want to develop
- for your device.
+ \o In the \gui {Device type} field, select
+ \gui {MeeGo 1.2 Harmattan}.
- \o Click \gui Projects to open the projects mode.
+ \o In the \gui Device field, select the device that you added
+ above.
- \o In the \gui{Build Settings} section, choose the MADDE Qt
- version that was registered by the installation program.
+ \o In the \gui Sysroot field, specify the path to the sysroot.
+ By default, the \QSDK installer places sysroot in the
+ following folder:
+ \c{QtSDK\Madde\bin\sysroots\harmattan_sysroot_10.2011.34-1_slim}.
- \image qtcreator-screenshot-build-settings.png
+ \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 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
+ 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
+ places qmake in the following folder:
+ \c{QtSDK\Madde\targets\harmattan_10.2011.34-1_rt1.2\bin\}.
+
+ \endlist
+
+ You can leave the \gui {Qt mkspec} field empty.
+
+ \o Open a project for an application you want to develop
+ for your device.
- \o In the \gui {Run Settings} section,
- \gui {Device configuration} field, select the
- device connection or the emulator connection.
- \image qtcreator-screenshot-run-settings.png
+ \o Select \gui Projects > \gui {Build & Run} > \gui {Add Kit} to
+ add the kit that you specified above.
- \endlist
+ \o Select \gui Run to specify run settings for the project.
- \note The new application wizards automatically set the folder
+ \o The Qt Quick project wizards automatically set the folder
where the file is installed on the device in the \gui {Remote
Directory} field. For example, \c {/opt/usr/bin}. If the text
\gui {<no target path set>} is displayed, click it to specify a
@@ -408,8 +423,7 @@
\o To specify the password, enter the following command:
\c{/usr/lib/mad-developer/devrootsh passwd user}
- \o In \QC, select \gui {Tools > Options Linux Devices >
- Device Configurations}.
+ \o In \QC, select \gui Tools > \gui Options > \gui Devices.
\o Specify the username \c user and the password in the device
configuration.