Commit 8fe04ce0 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.0'

parents 72e81db3 d190e7ca
......@@ -47,30 +47,12 @@
\list
\li Java Development Kit (JDK)
To check whether you have JDK installed, enter the following
command:
\c {java -version}
On Linux and Mac OS X, you can use OpenJDK. To install it on Linux,
enter the following command:
\c {sudo apt-get install openjdk-6-jdk}
On Windows, you must download and install JDK from
\l{http://www.oracle.com/technetwork/java/javase/downloads/index.html}
{Java SE Downloads} on the Oracle site.
\li \l{http://www.oracle.com/technetwork/java/javase/downloads/index.html}
{Java SE Development Kit (JDK)} version 6, or later
\li \l{http://ant.apache.org/bindownload.cgi}{Apache Ant} 1.8.0, or
later
To check the Ant version, enter the following command on the command
line:
\c {ant -version}
\li A tool chain for building applications for Android devices. You have
several options, such as the
\l{http://developer.android.com/sdk/index.html}{Android SDK} and
......@@ -79,7 +61,36 @@
\l{http://necessitas.kde.org/necessitas/necessitas_sdk_installer.php}
{Necessitas SDK} (supported for development with Qt 4).
\endlist
\li On Windows, you also need the following:
\list
\li MinGW v4.8.0 revision 2
\li Android Debug Bridge (ADB) driver on the Windows platform to
enable USB debugging. The default USB driver on Windows does not
allow debugging. For more information about obtaining the USB
driver, see \l{http://developer.android.com/sdk/win-usb.html}.
After installing the driver, try running a few basic
\l{http://developer.android.com/tools/help/adb.html}{adb}
commands to check that your device responds to them.
\endlist
\endlist
After installing these tools, update the Android SDK to get the API
and tools packages required for development. You can use the
\l{http://developer.android.com/tools/help/android.html}{android} tool
that comes with the SDK Tools package. For example, on Ubuntu the
following command starts the
\l{http://developer.android.com/sdk/installing/adding-packages.html}
{Android SDK Manager}, where you can select the packages to install:
\code
./android update sdk
\endcode
\section1 Developing with Qt 4
......
......@@ -209,7 +209,7 @@
\endcode
To launch the debugger in the core mode, select \gui{Debug > Start
Debugging > Attach to Core}.
Debugging > Load Core File}.
Also in this mode, using a properly configured project containing
the sources of the crashed program is not strictly necessary, but
......@@ -222,8 +222,8 @@
The \QC installation program asks you whether you want to
register \QC as a post-mortem debugger. To change the setting, select
\gui{Tools > Options > Debugger > Common > Use Qt Creator for post-mortem
debugging}.
\gui Tools > \gui Options > \gui Debugger > \gui General > \gui {Use Qt
Creator for post-mortem debugging}.
You can launch the debugger in the post-mortem mode if an application
crashes on Windows. Click the \gui {Debug in \QC} button in the error
......@@ -246,7 +246,8 @@
the user of \QC. To start debugging on a remote target with the
necessary helper processes running, select the corresponding
\l{glossary-buildandrun-kit}{kit} in
\gui{Projects > Build & Run} or in the \gui{Debug > Start Debugging} menu.
\gui{Projects > Build & Run}, and then select a function to start remote
debugging in the \gui{Debug > Start Debugging} menu.
Special use cases, such as attaching to a running process on the
target, might still require manual setup.
......@@ -750,8 +751,8 @@
\section2 Viewing Threads
If a multi-threaded program is interrupted, the \gui Thread view or the
combobox named \gui Thread in the debugger's status bar can be used to
If a multi-threaded program is interrupted, the \gui Threads view or the
combobox named \gui Threads in the debugger status bar can be used to
switch from one thread to another. The \gui Stack view adjusts itself
accordingly.
......
......@@ -79,11 +79,15 @@
\section2 File Encoding
To define the default file encoding, select a suitable option in
To define the default file encoding, select \gui Tools > \gui Options >
\gui {Text Editor} > \gui Behavior, and then select a suitable option in
\gui {Default encoding}.
Qt 5 requires UTF-8 encoded source files, and therefore the default
encoding was changed from \gui System to \gui UTF-8 in \QC version 2.6.
However, the \gui {Default encoding} field still displays the value
\gui System if the default system encoding is set to UTF-8.
Detecting the correct encoding is tricky, so \QC will not try to do so.
Instead, it displays the following error message when you try to edit a file
that is not UTF-8 encoded: \gui {Error: Could not decode "filename" with
......
......@@ -1093,6 +1093,10 @@
\li Align continuation lines.
\li Bind pointers (*) and references (&) in types and declarations to
identifiers, type names, or left or right \c const or \c volatile
keywords.
\endlist
You can use the live preview to see how the options change the indentation.
......@@ -1233,6 +1237,17 @@
\image qtcreator-code-style-alignment.png "Alignment options"
\section1 Binding Pointers and References
To bind pointers (*) and references (&) in types and declarations to
identifiers, type names, or left or right \c const or \c volatile keywords,
select the check boxes in the \gui {Pointers and References} tab.
The * and & characters are automatically bound to identifiers of pointers to
functions and pointers to arrays.
\image qtcreator-pointers-references.png "Pointers and References options"
*/
......
......@@ -2,9 +2,6 @@
\list 1
\li Build and run the application for \l{Running on Qt Simulator}
{\QS}.
\li Build and run the application for a device:
\list 1
......
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