Commit b67c3874 authored by Leena Miettinen's avatar Leena Miettinen

Doc: separate MeeGo and Maemo instructions

Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 519e0a79
......@@ -13,8 +13,13 @@ include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf)
sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc qtcreator-faq.qdoc linuxdev.qdoc"
sources.fileextensions = "qtcreator.qdoc \
maemodev.qdoc \
symbiandev.qdoc \
addressbook-sdk.qdoc \
qtcreator-faq.qdoc \
linuxdev.qdoc \
meegodev.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
......
......@@ -83,5 +83,5 @@ OTHER_FILES = $$HELP_DEP_FILES $$DEV_HELP_DEP_FILES
fixnavi.commands = \
cd $$targetPath($$PWD) && \
perl fixnavi.pl -Dqcmanual -Dqtquick \
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc linuxdev.qdoc
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc linuxdev.qdoc meegodev.qdoc
QMAKE_EXTRA_TARGETS += fixnavi
\section2 Generating SSH Keys
If you do not have an SSH public and private key pair, you can generate it
in Qt Creator. You can specify key length and the key algorithm, RSA or DSA.
If you only use the keys to protect connections to the emulator or
device, you can use the default values.
\list 1
\o Select \gui {Tools > Options... > Linux Devices > Device
Configurations > Generate SSH Key...}.
\o Click \gui {Generate SSH Key}.
\image qtcreator-ssh-key-configuration.png "SSH Key Configuration dialog"
\o Click \gui {Save Public Key...} to select the location to save the
public key.
\o Click \gui {Save Private Key...} to specify the location to save the
private key.
\o Click \gui Close to close the dialog.
\endlist
\section2 Managing Device Processes
You can view processes running on devices and kill them. Select
\gui {Tools > Options... > Linux Devices > Device Configurations >
Remote Processes...}.
You can filter the processes by name in the \gui {List of Remote 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}.
......@@ -22,9 +22,9 @@
/*!
\contentspage index.html
\previouspage creator-developing-maemo.html
\previouspage creator-developing-meego.html
\page creator-developing-generic-linux.html
\nextpage creator-developing-symbian.html
\nextpage creator-developing-maemo.html
\title Connecting Generic Linux Devices
......
This diff is collapsed.
This diff is collapsed.
......@@ -67,8 +67,9 @@
\o \l{Creating a Project}
\o \l{Opening a Project}
\o \l{Adding Libraries to Projects}
\o \l{Connecting Maemo and MeeGo Harmattan Devices}
\o \l{Connecting MeeGo Harmattan Devices}
\o \l{Connecting Generic Linux Devices}
\o \l{Connecting Maemo Devices}
\o \l{Connecting Symbian Devices}
\o \l{Managing Sessions}
\endlist
......@@ -3317,7 +3318,8 @@
\o \l{Creating a Project}
\o \l{Opening a Project}
\o \l{Adding Libraries to Projects}
\o \l{Connecting Maemo and MeeGo Harmattan Devices}
\o \l{Connecting Maemo Devices}
\o \l{Connecting MeeGo Harmattan Devices}
\o \l{Connecting Generic Linux Devices}
\o \l{Connecting Symbian Devices}
\o \l{Managing Sessions}
......@@ -4259,7 +4261,7 @@
\contentspage index.html
\previouspage creator-project-opening.html
\page creator-project-qmake-libraries.html
\nextpage creator-developing-maemo.html
\nextpage creator-developing-meego.html
\title Adding Libraries to Projects
......@@ -4587,7 +4589,8 @@
\list 1
\o Configure the device and specify a connection to it. For more
information, see \l{Connecting Maemo and MeeGo Harmattan Devices}.
information, see \l{Connecting Maemo Devices} and
\l{Connecting MeeGo Harmattan Devices}.
\o Connect the device to the development PC.
......@@ -5063,7 +5066,8 @@
create connections
from the development PC to the devices. Click \gui {Manage device
configurations} to create connections. For more information, see
\l {Configuring Connections in Qt Creator}.
\l{Configuring Connections to Maemo Devices} and
\l{Configuring Connections to Harmattan Devices}.
When you run the application on the \gui{Maemo5} or \gui Harmattan target,
Qt Creator generates
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment