feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: where appropriate, refer to Qt 4 SDK

Browse Source 
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 <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Leena Miettinen
2012-10-22 15:03:38 +02:00
committed by hjk
parent 1ac3850c6f
commit 8b8d104c58
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/linux-mobile/creator-madde-emulator.qdoc
View File

@@ -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

18
doc/src/linux-mobile/maemodev.qdoc
View File

@@ -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\}.

18
doc/src/linux-mobile/meegodev.qdoc
View File

@@ -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\}.

2
doc/src/overview/creator-issues.qdoc
View File

@@ -106,7 +106,7 @@
\if defined(qcmanual)
\o On Windows, you must create projects for Maemo 5 and Harmattan
device types on the same partition where you installed \QSDK, \QC, and
device types on the same partition where you installed Qt 4 SDK, \QC, and
MADDE.
\endif

4
doc/src/projects/creator-projects-building-running.qdoc
View File

@@ -92,7 +92,7 @@
\QS does not support any device specific APIs by design.
Therefore, applications that run well on \QS also run on
any device that hosts the Qt and Qt Mobility libraries.
The \QS is installed as part of the \QSDK. After it is
The \QS is installed as part of the Qt 4 SDK. After it is
installed, you can create a \l{glossary-buildandrun-kit}{kit}
with \gui Desktop device type and the Qt Simulator Qt version for
building and running your projects.
@@ -106,7 +106,7 @@
controls, such as the power button, and to the touch screen.
Usually, it is faster to test on a real device connected to the
development PC than to use the emulators. The emulator is installed
as part of the \QSDK.
as part of the Qt 4 SDK.
\endlist

2
doc/src/projects/creator-projects-cmake.qdoc
View File

@@ -49,7 +49,7 @@
\note Before you open a \c CMake project, you must modify the \c{PATH}
environment variable to include the bin folders of \c mingw and Qt.
For instance, if the \QSDK is installed in \c {C:\SDK}, you would use the
For instance, if the Qt 4 SDK is installed in \c {C:\SDK}, you would use the
following command to set the environment variables in the command line
prompt:
\code

2
doc/src/projects/creator-projects-creating.qdoc
View File

@@ -68,7 +68,7 @@
build the project.
You can install tools for mobile devices
as part of the \QSDK. The \l{glossary-buildandrun-kit}{kits} and build and run settings for the
as part of an SDK. The \l{glossary-buildandrun-kit}{kits} and build and run settings for the
installed device types are set up automatically. However, you might need to
install and configure some additional software on the devices to be able to
connect to them from the development PC.

2
doc/src/projects/creator-projects-qt-versions.qdoc
View File

@@ -32,7 +32,7 @@
\QC allows you to have multiple versions of Qt installed on your development
PC and use different versions to build your projects.
For example, \QSDK contains special Qt versions for developing applications
For example, Qt 4 SDK contains special Qt versions for developing applications
for mobile devices.
\QC automatically detects the Qt versions that are registered by

2
doc/src/qtquick/qtquick-components.qdoc
View File

@@ -76,7 +76,7 @@
QML elements allow you to write cross-platform applications with custom look
and feel. You can also use ready-made Qt Quick Components that enable you to
create applications with a native look and feel for a particular target
platform. You can install the components as part of \QSDK.
platform. You can install the components as part of the Qt 4 SDK.
When you use the \QC project wizard to create Qt Quick applications, you
can select which component set to use in your application.

2
doc/src/qtquick/qtquick-screens.qdoc
View File

@@ -42,7 +42,7 @@
You can also use ready-made Qt Quick Components that allow you to create
screens with a native look and feel for a particular target platform. You
can install the components as part of \QSDK.
can install the components as part of the Qt 4 SDK.
\if defined(qcmanual)
\section1 Adding Components to Screens