diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 31a698dab10..dceb987dc6f 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -37,7 +37,8 @@ \title Connecting Android Devices You can connect Android devices to the development PC to run, debug, - and analyze applications built for them from \QC. + and analyze applications built for them from \QC. Devices with Android + version 4.1 (API level 16) or later are supported. If you have a tool chain for building applications for Android devices installed on the development PC, you can add it to \QC. You can then add a @@ -59,7 +60,10 @@ \list \li \l{http://www.oracle.com/technetwork/java/javase/downloads/index.html} - {Java SE Development Kit (JDK)} version 6, or later + {Java SE Development Kit (JDK)} version 6, or later. + You can also use \l{http://openjdk.java.net/}{OpenJDK} on Linux. + + \note Android SDK Tools have issues with JDK versions later than 8. \li \l{http://www.gradle.org}{Gradle} for building application packages for Android devices (APK). Gradle is delivered with Qt 5.9, and @@ -71,7 +75,7 @@ \li A tool chain for building applications for Android devices provided by the \l{http://developer.android.com/tools/sdk/ndk/index.html} - {Android NDK} from Google. + {Android NDK} from Google. The recommended version is 10e. \li \l{http://developer.android.com/sdk/index.html}{Android SDK Tools} @@ -106,9 +110,12 @@ \section1 Setting Up the Development Environment 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: + update or install the tools and packages needed for development. However, + if your Qt version is earlier than v5.9, use the SDK tools package v25.2.5 + or earlier. + + 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 @@ -135,6 +142,10 @@ In addition, you must install Qt for Android as part of Qt 5.2, or later. + \note You can build a 64-bit version of Qt for Android yourself. However, + for such a Qt version, the minimum required Android version on devices + is 5.0 (API level 21). + For more information, see \l{Qt for Android}. \section2 Specifying Android Device Settings @@ -287,22 +298,11 @@ \section1 Debugging on Android Devices - Android devices support debugging multi-thread applications in version - 2.2.1 and later. If you use AVD, select Android 2.3, or later. For more - information, see the Android documentation. - - In addition, debugging is supported at android-10 API level, or higher. In - the run settings for the project, in the \uicontrol {Android build SDK} field, - select android-10, or higher. For more information about Android API levels, - see \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels} - {What is API Level?}. - - \note Select a \l{glossary-build-config}{debug build configuration} to build + Select a \l{glossary-build-config}{debug build configuration} to build the application for debugging. \note \QC cannot debug applications on Android devices if Android Studio is running. If the following message is displayed in the \uicontrol Output pane, close Android Studio and try again: \e {Ignoring second debugger - accepting and dropping.} - */ diff --git a/doc/src/editors/creator-code-completion.qdoc b/doc/src/editors/creator-code-completion.qdoc index fead6f1827d..8152568c06d 100644 --- a/doc/src/editors/creator-code-completion.qdoc +++ b/doc/src/editors/creator-code-completion.qdoc @@ -60,7 +60,7 @@ first-letter case-sensitivity, select \uicontrol Full or \uicontrol {First Letter} in the \uicontrol {Case-sensitivity} field. - \section2 Summary of Available Types + \section1 Summary of Available Types The following table lists available types for code completion and icon used for each. @@ -132,7 +132,7 @@ \endif \endtable - \section2 Completing Code Snippets + \section1 Completing Code Snippets Code snippets can consist of multiple variables that you specify values for. Select an item in the list and press \key Tab or \key Enter to complete the @@ -189,7 +189,7 @@ \endlist - \section3 Adding and Editing Snippets + \section2 Adding and Editing Snippets Select a snippet in the list to edit it in the snippet editor. To add a new snippet, select \uicontrol Add. Specify a trigger and, if the trigger is @@ -268,7 +268,7 @@ To discard the changes you made to a built-in snippet, select \uicontrol {Revert Built-in}. - \section3 Removing Snippets + \section2 Removing Snippets Several similar built-in snippets might be provided for different use cases. To make the list of suggestions shorter when you write code, remove the @@ -279,7 +279,7 @@ \uicontrol Remove. To restore the removed snippets, select \uicontrol {Restore Removed Built-ins}. - \section3 Resetting Snippets + \section2 Resetting Snippets To remove all added snippets and to restore all removed snippets, select \uicontrol {Reset All}. diff --git a/doc/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/src/overview/creator-only/creator-mobile-targets.qdoc index f11203d6727..9cc50396568 100644 --- a/doc/src/overview/creator-only/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-only/creator-mobile-targets.qdoc @@ -56,8 +56,9 @@ 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 a Qt version targeting Android and - the Android SDK and NDK to develop for Android devices. + 4.1 (API level 16), or later. You must install a Qt version + targeting Android and the Android SDK and NDK to develop for + Android devices. \if defined(qtcreator) \li \l{Connecting Bare Metal Devices} diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 976dbf7cb30..a2303a01056 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.8.0-beta1' + property string qtcreator_display_version: '4.8.0-beta2' property string ide_version_major: '4' property string ide_version_minor: '7' - property string ide_version_release: '82' + property string ide_version_release: '83' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' property string ide_compat_version_minor: '7' - property string ide_compat_version_release: '82' + property string ide_compat_version_release: '83' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release diff --git a/qtcreator.pri b/qtcreator.pri index 15f544ff4db..f706e48e661 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,10 +1,10 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 4.7.82 -QTCREATOR_COMPAT_VERSION = 4.7.82 +QTCREATOR_VERSION = 4.7.83 +QTCREATOR_COMPAT_VERSION = 4.7.83 VERSION = $$QTCREATOR_VERSION -QTCREATOR_DISPLAY_VERSION = 4.8.0-beta1 +QTCREATOR_DISPLAY_VERSION = 4.8.0-beta2 QTCREATOR_COPYRIGHT_YEAR = 2018 BINARY_ARTIFACTS_BRANCH = master diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 752ab14021f..dd339042bf0 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -2795,7 +2795,7 @@ def qdump__qfloat16(d, value): elif exp == 0b11111: res = ('-inf' if sign else 'inf') if fraction == 0 else 'nan' else: - res = (-1)**sign * (1 + fraction / 2**10) * 2**(exp - 15) + res = (-1)**sign * (1 + 1. * fraction / 2**10) * 2**(exp - 15) d.putValue(res) d.putNumChild(1) d.putPlainChildren(value) diff --git a/share/qtcreator/styles/creator-dark.xml b/share/qtcreator/styles/creator-dark.xml index 7c04fa3f011..bff4b21bd42 100644 --- a/share/qtcreator/styles/creator-dark.xml +++ b/share/qtcreator/styles/creator-dark.xml @@ -25,7 +25,9 @@