forked from qt-creator/qt-creator
Doc: remove obsolete \if defined commands
The doc sources are no longer used for single-sourcing. Change-Id: I934c88c19646d84b4de3c5787234148f947c4489 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Leena Miettinen
@@ -19,11 +19,7 @@
|
||||
/*!
|
||||
|
||||
\contentspage index.html
|
||||
\if defined(qcmanual)
|
||||
\previouspage creator-developing-generic-linux.html
|
||||
\else
|
||||
\previouspage creator-developing-meego.html
|
||||
\endif
|
||||
\page creator-developing-maemo.html
|
||||
\nextpage creator-developing-meego.html
|
||||
|
||||
@@ -40,11 +36,9 @@
|
||||
development is disabled by default. To enable it, select \gui Help >
|
||||
\gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC.
|
||||
|
||||
\if defined(qcmanual)
|
||||
For more
|
||||
information about the Maemo 5 platform, see
|
||||
\l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site.
|
||||
\endif
|
||||
|
||||
For more information about developing applications for the Maemo 5
|
||||
platform, select \gui {Help > Index} and look for \gui {Platform Notes},
|
||||
@@ -58,10 +52,8 @@
|
||||
|
||||
\li Maemo 5 device: Nokia N900 with software update release 1.3
|
||||
(V20.2010.36-2) or later installed.
|
||||
\if defined(qcmanual)
|
||||
\li MADDE cross-platform Maemo development
|
||||
tool (installed as part of the Qt 4 SDK).
|
||||
\endif
|
||||
|
||||
\li Nokia USB drivers.
|
||||
|
||||
@@ -234,13 +226,7 @@
|
||||
testing. If you write applications that use Qt Mobility APIs, you might want
|
||||
to test them with real user data. To create a connection as a user, specify
|
||||
the \gui Username and \gui Password in \QC. For more information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Testing with User Data on Maemo Devices}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-maemo.html#testing-with-user-data-on-maemo-devices}
|
||||
{Testing with User Data on Maemo Devices}.
|
||||
\endif
|
||||
|
||||
|
||||
You can protect the connections between \QC and
|
||||
a device by using either a password or an SSH key. If you use a password, you
|
||||
@@ -250,22 +236,11 @@
|
||||
If you do not have an SSH key, you can create it in \QC.
|
||||
Encrypted keys are not supported. For more
|
||||
information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Generating SSH Keys}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
|
||||
{Generating SSH Keys}.
|
||||
\endif
|
||||
|
||||
|
||||
You can view processes running on devices and kill them. For more
|
||||
information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Managing Device Processes}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
|
||||
{Managing Device Processes}.
|
||||
\endif
|
||||
|
||||
|
||||
To configure connections between \QC and a
|
||||
@@ -309,8 +284,6 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\if defined(qcmanual)
|
||||
|
||||
\li To test applications on the emulator (QEMU) separately, you must
|
||||
create a connection to it from the development PC. If you installed
|
||||
Qt 4 SDK, the connection is created automatically and you can omit this
|
||||
@@ -330,7 +303,6 @@
|
||||
connection.
|
||||
|
||||
\endlist
|
||||
\endif
|
||||
|
||||
\li Select \gui Tools > \gui Options > \gui {Build & Run} >
|
||||
\gui Kits > \gui Add to add a kit for building for the device:
|
||||
|
||||
@@ -21,11 +21,7 @@
|
||||
\contentspage index.html
|
||||
\previouspage creator-developing-maemo.html
|
||||
\page creator-developing-meego.html
|
||||
\if defined(qcmanual)
|
||||
\nextpage creator-developing-qnx.html
|
||||
\else
|
||||
\nextpage creator-developing-maemo.html
|
||||
\endif
|
||||
|
||||
\title Connecting MeeGo Harmattan Devices
|
||||
|
||||
@@ -39,12 +35,9 @@
|
||||
development is disabled by default. To enable it, select \gui Help >
|
||||
\gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC.
|
||||
|
||||
\if defined(qcmanual)
|
||||
For more information about the Harmattan platform, see
|
||||
\l{http://library.developer.nokia.com/topic/MeeGo_1.2_Harmattan_API/html/guide/html/Developer_Library_Harmattan_overview_5dcf.html}
|
||||
{Harmattan Overview} in the MeeGo 1.2 Harmattan Developer Library.
|
||||
\endif
|
||||
|
||||
|
||||
\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
|
||||
@@ -247,13 +240,7 @@
|
||||
If you write applications that use Qt Mobility APIs, you might want to test
|
||||
them with real user data. To create a connection as a user, specify the
|
||||
\gui Username and \gui Password in \QC. For more information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Testing with User Data on MeeGo Devices}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#testing-with-user-data-on-meego-devices}
|
||||
{Testing with User Data on MeeGo Devices}.
|
||||
\endif
|
||||
|
||||
|
||||
You can protect the connections between \QC and a device by using
|
||||
either a password or an SSH key. If you use a password, you must generate it
|
||||
@@ -262,23 +249,11 @@
|
||||
|
||||
If you do not have an SSH key, you can create it in \QC. Encrypted
|
||||
keys are not supported. For more information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Generating SSH Keys}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
|
||||
{Generating SSH Keys}.
|
||||
\endif
|
||||
|
||||
|
||||
You can view processes running on devices and kill them. For more
|
||||
information, see
|
||||
\if defined(qcmanual)
|
||||
\l{Managing Device Processes}.
|
||||
\else
|
||||
\l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
|
||||
{Managing Device Processes}.
|
||||
\endif
|
||||
|
||||
|
||||
To configure connections between \QC and a device:
|
||||
|
||||
@@ -324,8 +299,6 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\if defined(qcmanual)
|
||||
|
||||
\li To test applications on the emulator (QEMU), you must
|
||||
create a connection to it from the development PC. If you installed
|
||||
Qt 4 SDK, the connection is created automatically and you can omit this
|
||||
@@ -355,8 +328,6 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\endif
|
||||
|
||||
\li Select \gui Tools > \gui Options > \gui {Build & Run} >
|
||||
\gui Kits > \gui Add to add a kit for building for the device:
|
||||
|
||||
@@ -410,8 +381,6 @@
|
||||
|
||||
\endlist
|
||||
|
||||
\if defined(qcmanual)
|
||||
|
||||
\section2 Testing with User Data on MeeGo Devices
|
||||
|
||||
To run your application as the default user, you must first assign a
|
||||
@@ -436,8 +405,6 @@
|
||||
\include linux-mobile/linuxdev-keys.qdocinc
|
||||
\include linux-mobile/linuxdev-processes.qdocinc
|
||||
|
||||
\endif
|
||||
|
||||
\section1 Troubleshooting Harmattan Connections
|
||||
|
||||
The addresses used in this example might be reserved by some other
|
||||
|
||||
Reference in New Issue
Block a user