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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I7881fc51021c49b792a384ad9f8a4f71fc457ce2
This commit is contained in:
Eike Ziller
2017-09-04 16:12:34 +02:00
parent d9974ec6d5 33bb20ba57
commit 3543bd5d1a
29 changed files with 319 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
doc/src/android/androiddev.qdoc
View File

@@ -72,10 +72,14 @@
\li \l{http://developer.android.com/sdk/index.html}{Android SDK Tools}
After installing the Tools, you can use the
\l{https://developer.android.com/studio/command-line/sdkmanager.html}
{sdkmanager} to get the API and tools packages required for
development.
The following Android SDK packages and tools are required for
development:
\list
\li Platform tools
\li Build tools
\li At least one SDK platform
\endlist
\li On Windows, you also need the following:
@@ -98,13 +102,33 @@
\section1 Setting Up the Development Environment
You must download and install the latest Android NDK and SDK, and update the
SDK to get the build and platform tools needed for development. Since
SDK tools version 25.3.0, \QC, you must use the
\l{https://developer.android.com/studio/command-line/sdkmanager.html}
{sdkmanager} command line tool for SDK package management and the
\l{https://developer.android.com/studio/command-line/avdmanager.html}
{avdmanager} tool for Android Virtual Device (AVD) management.
You must download and install the latest Android NDK and SDK, and then
update or install the tools and packages needed for development. The SDK
tool used to update and install the other SDK tools and packages depends on
the Android SDK Tools version that you have installed:
\list
\li Android SDK Tools version 25.2.5, or earlier
Use the
\l{https://developer.android.com/studio/tools/help/android.html}
{android} tool that comes with the SDK Tools package. For example,
on Ubuntu the following command starts the SDK update:
\code
./android update sdk
\endcode
\li Android SDK Tools version 25.3.0, or later
Use the
\l{https://developer.android.com/studio/command-line/sdkmanager.html}
{sdkmanager} command line tool for SDK package management and the
\l{https://developer.android.com/studio/command-line/avdmanager.html}
{avdmanager} tool for Android Virtual Device (AVD) management.
\endlist
In addition, you must install Qt for Android as part of Qt 5.2, or later.

4
doc/src/debugger/creator-debugger.qdoc
View File

@@ -1090,7 +1090,7 @@
size = value["_size"].integer()
d.putItemCount(size)
if d.isExpanded():
d.putArrayData(value.type[0], value["_array"], size)
d.putArrayData(value["_array"], size, value.type[0])
\endcode
\note To create dumper functions usable with both LLDB and GDB backends,
@@ -1211,7 +1211,7 @@
\endlist
\li \c{putArrayData(self, type, address, itemCount)} - Creates the
\li \c{putArrayData(self, address, itemCount, type)} - Creates the
number of children specified by \c itemCount of the type \c type of
an array-like object located at \c address.

21
doc/src/ios/creator-ios-dev.qdoc
View File

@@ -32,7 +32,7 @@
\title Connecting iOS Devices
You can connect iOS devices to a Mac computer with a USB cable to
You can connect iOS devices to your local machine with a USB cable to
run applications built for them from \QC.
To be able to use \QC on \macos, you must install Xcode, and therefore,
@@ -52,7 +52,7 @@
{enroll in the Apple Developer Program}. The certificate is copied to
the device when you configure the device.
The first time you connect the device to the Mac, you are asked to enable
The first time you connect the device to your local machine, you are asked to enable
developer mode on the device. The next time you connect the device, \QC
detects it automatically. To disable automatic connections to a device that
you do not use for development, select \uicontrol Preferences >
@@ -69,7 +69,7 @@
\li Make sure that you have Xcode and Qt for iOS installed.
\li Connect the device to the Mac computer with a USB cable.
\li Connect the device to your local machine with a USB cable.
\li Start Xcode to configure the device.
@@ -96,6 +96,11 @@
\image qtcreator-build-settings-ios.png "iOS build settings"
\li Select the \uicontrol {Automatically manage signing} check box
to automatically select the provisioning profile and signing
certificate on your local machine that matches the entitlements
and the bundle identifier of the iOS device.
\endlist
\li Select \uicontrol Run to specify run settings.
@@ -112,13 +117,13 @@
\note If you cannot deploy applications, because a provisioning profile is
missing, check that provisioning profiles are listed in Xcode by selecting
\uicontrol Xcode > \uicontrol Preferences > \uicontrol Accounts >
\uicontrol {View Details}. For more information about how to acquire and
install a provisioning profile, see Apple documentation.
\uicontrol Xcode > \uicontrol Preferences > \uicontrol Accounts. For more
information about how to acquire and install a provisioning profile, see
Apple documentation.
\section1 Viewing Device Connection Status
When you connect an iOS device to a Mac computer with USB, \QC
When you connect an iOS device to your local machine with USB, \QC
automatically detects the device if you have configured it by using Xcode.
To view information about the connected device, select \uicontrol Preferences >
\uicontrol Devices.
@@ -186,7 +191,7 @@
\li In the \uicontrol {Device type} field, select the device type from
a list of devices supported by the Xcode version set as current on
the Mac computer.
your local machine.
\li In the \uicontrol {OS version} field, select an OS version from a
list of OS versions supported by the selected device and the current