Skip to content

GitLab

Commit 7b088afb authored by Leena Miettinen's avatar Leena Miettinen
Browse files

Doc: don't use the term SDK in connection with Qt 



Replace with "Qt distributions" or "installers" or rewrite
in some other way.

Remove references to installing Qt 4 SDK, because it is
no longer available for downloading.

Change-Id: I291f82702e21d953f2efbb0e634d6454b4bc17b9
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 2c42b06f
Hide whitespace changes
Inline Side-by-side
doc/config/macros.qdocconf
View file @ 7b088afb
......@@ -22,7 +22,7 @@ macro.QL = "Qt Linguist"
macro.QMLD = "Qt Quick Designer"
macro.QQV = "Qt QML Viewer"
macro.QS = "Qt Simulator"
macro.QSDK = "Qt SDK"
macro.QSDK = "Qt"
macro.qtcversion = $QTC_VERSION
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
......
doc/src/howto/qtcreator-faq.qdoc
View file @ 7b088afb
......@@ -105,7 +105,7 @@
\QC comes fully integrated with Qt documentation and examples using
the Qt Help plugin. The integrated Qt Reference Documentation is available
for Qt 4.4 and later. \QC, \QSDK, and other Qt deliverables contain
for Qt 4.4 and later. \QC and other Qt deliverables contain
documentation as .qch files. All the documentation is accessible in the
\gui Help mode.
......@@ -121,9 +121,9 @@
\b {If I have a choice of GDB versions, which should I use?}
On Linux and Windows, use the Python-enabled GDB versions that are
installed when you install \QC and Qt SDK. On Mac OS X, use the GDB
provided with Xcode. For a custom target, you can build your own
Python-enabled GDB. Follow the instructions in
installed when you install \QC and \QSDK. On Mac OS X, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
You must use Python version 2.6 or 2.7.
......@@ -161,11 +161,12 @@
many parallel processes as your CPU has cores. You can override this
behavior by using the \c{-j} parameter as described above.
\section1 Qt SDK Questions
\section1 Qt Installation Questions
\b {I cannot use QSslSocket with the SDK. What should I do?}
\b {I cannot use QSslSocket with the Qt I installed from binary packages.
What should I do?}
The Qt build in the SDK is built with QT_NO_OPENSSL defined. Rebuilding it
The Qt in the binary packages is built with QT_NO_OPENSSL defined. Rebuilding it
is possible. For more information, see
\l{http://www.qtcentre.org/threads/19222-Qssl}.
......
doc/src/overview/creator-mobile-targets.qdoc
View file @ 7b088afb
......@@ -31,10 +31,9 @@
\title Connecting Mobile Devices
You can connect mobile devices to the development PC to build, run, debug,
and analyze applications on them from \QC. When you install an SDK for a
and analyze applications on them from \QC. When you install Qt for a
target platform, such as Android or QNX, the build and run settings for the
development targets delivered with the SDK might be set up automatically in
\QC.
development targets might be set up automatically in \QC.
You can connect the device to the development PC using a USB connection.
Additionally, you can connect Linux-based devices by using a WLAN
......@@ -45,12 +44,12 @@
\li \l{Connecting Android Devices}
Qt applications for Android are compiled as \c {shared objects} that
are loaded by a Java launcher generated by the Qt for Android SDK.
are loaded by a Java launcher that is part of Qt.
This is totally transparent to users. As Qt is composed of libraries
referencing each other, Qt 4 applications are only supported on
Android version 1.6, or later, and Qt 5 applications on version
2.3.3, or later. You must install the Qt for Android SDK to develop
for Android devices.
2.3.3, or later. You must install a Qt version targeting Android and
the Android SDK and NDK to develop for Android devices.
\li \l{Connecting Bare Metal Devices}
......
doc/src/projects/creator-projects-building-running.qdoc
View file @ 7b088afb
......@@ -63,7 +63,7 @@
\li \l{Connecting Mobile Devices}
When you install tool chains for device types as part of an SDK,
When you install tool chains for device types as part of a Qt distribution,
the build and run settings for mobile device types might be set up
automatically. However, you might need to install and configure some
additional software on the devices to be able to connect to them
......
doc/src/projects/creator-projects-compilers.qdoc
View file @ 7b088afb
......@@ -37,7 +37,7 @@
application on a particular platform.
\QC automatically detects the compilers that are registered by your system
or by an SDK. You can add compilers to build applications by using other
or by an installer. You can add compilers to build applications by using other
compilers or by using additional versions of the automatically detected
compilers:
......@@ -49,7 +49,7 @@
\li MinGW (Minimalist GNU for Windows) is a native software port of GCC
and GNU Binutils for use in the development of native Microsoft
Windows applications on Windows. MinGW is
distributed together with \QC and Qt SDK for Windows.
distributed together with \QC and Qt installers for Windows.
\li Linux ICC (Intel C++ Compiler) is a group of C and C++ compilers
for Linux.
......
doc/src/projects/creator-projects-creating.qdoc
View file @ 7b088afb
......@@ -65,8 +65,8 @@
use \QC as a code editor and to fully control the steps and commands used to
build the project.
You can install tools for mobile devices
as part of an SDK. The \l{glossary-buildandrun-kit}{kits} and build and run settings for the
You can install tools for mobile devices as part of Qt distributions.
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.
......
doc/src/projects/creator-projects-qt-versions.qdoc
View file @ 7b088afb
......@@ -32,11 +32,11 @@
\QC allows you to have multiple versions of Qt installed on your development
PC and use different versions to build your projects.
For example, Qt 4 SDK contains special Qt versions for developing applications
for mobile devices.
For example, device manufacturers provide special Qt versions for developing
applications for their devices.
\QC automatically detects the Qt versions that are registered by
your system or by \QSDK. To view detailed information for each Qt
your system or by installers. To view detailed information for each Qt
version, select it in the list and select \gui Details in the
\gui {Qt version for} section. To add Qt versions, select
\gui {Tools > Options > Build & Run > Qt Versions}.
......
doc/src/projects/creator-projects-settings-overview.qdoc
View file @ 7b088afb
......@@ -30,9 +30,9 @@
\title Configuring Projects
When you install an SDK for a target platform, such as Android or QNX, the
build and run settings for the development
targets delivered with the SDK might be set up automatically in \QC.
When you install Qt for a target platform, such as Android or QNX, the
build and run settings for the development targets might be set up
automatically in \QC.
To view and modify the settings for currently open projects, switch to the
\gui Projects mode by pressing \key Ctrl+5.
......
doc/src/qtquick/qtquick-components.qdoc
View file @ 7b088afb
......@@ -77,8 +77,8 @@
Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
desktop-style user interfaces using Qt Quick 2.1.
You can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt
Quick Controls as part of Qt 5.1, or later.
Qt Quick 1 Components are a part of Qt 4, whereas Qt Quick Controls were
added to Qt 5.1.
The \QC project wizards create Qt Quick applications that use Qt Quick
Components or Controls.
......
doc/src/qtquick/qtquick-screens.qdoc
View file @ 7b088afb
......@@ -41,9 +41,8 @@
You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
screens with a native look and feel for a particular target platform.
Since Qt 5.1, a set of Qt Quick Controls is available for creating classic
desktop-style user interfaces using Qt Quick 2.1. You
can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt Quick
Controls as part of Qt 5.1, or later.
desktop-style user interfaces using Qt Quick 2.1. Qt Quick 1 Components are
a part of Qt 4, whereas Qt Quick Controls were added to Qt 5.1.
\section1 Adding Components to Screens
......
doc/src/widgets/qtdesigner-plugins.qdoc
View file @ 7b088afb
......@@ -47,8 +47,8 @@
\QD fetches plugins from the standard locations and loads the plugins
that match its build key. \QD is delivered both as a standalone application
and as part of the SDK, where it is integrated into \QC. The correct folder
to place the plugins depends on which one you use.
and integrated into \QC. The correct folder to place the plugins depends on
whether you use the standalone \QD or the integrated \QD.
The integrated \QD fetches plugins from the \c {%SDK%\bin\designer} folder
on Windows and Linux. For information about how to configure plugins on
......@@ -128,7 +128,7 @@
\section1 Matching Build Keys
The \QC that is included in pre-built SDK packages on Windows is built with
The \QC that is included in pre-built Qt packages on Windows is built with
the Microsoft Visual Studio compiler, whereas the version of Qt shipped for
building applications is configured and built to use the MinGW/g++ compiler.
Plugins built by using this version of Qt cannot be loaded by \QC because
......
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