diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:00:22 +0200 |
| commit | 887416f3d8a3c1bb70e928ee5d652e34cbc6ed9c (patch) | |
| tree | d02d0f3fbd7a27e77142993dabc80aad04365720 | |
| parent | 18a112a3921eec5e630c07aa66230bf0cbd32742 (diff) | |
| parent | 5755e89a9de6c60ac574759bc820a7b915b9ee62 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I18e38d785174cdcfe7982ff1c831b72361b1140c
| -rw-r--r-- | dist/changes-5.12.3 | 20 | ||||
| -rw-r--r-- | examples/sensors/accelbubble/android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | examples/sensors/maze/android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/sensors/sensors.pro | 2 |
4 files changed, 22 insertions, 4 deletions
diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3 new file mode 100644 index 00000000..88033201 --- /dev/null +++ b/dist/changes-5.12.3 @@ -0,0 +1,20 @@ +Qt 5.12.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.2. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/examples/sensors/accelbubble/android/AndroidManifest.xml b/examples/sensors/accelbubble/android/AndroidManifest.xml index f3104443..4627978e 100644 --- a/examples/sensors/accelbubble/android/AndroidManifest.xml +++ b/examples/sensors/accelbubble/android/AndroidManifest.xml @@ -65,7 +65,7 @@ </application> - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. diff --git a/examples/sensors/maze/android/AndroidManifest.xml b/examples/sensors/maze/android/AndroidManifest.xml index de787fad..bfb126a6 100644 --- a/examples/sensors/maze/android/AndroidManifest.xml +++ b/examples/sensors/maze/android/AndroidManifest.xml @@ -42,7 +42,7 @@ <!-- Background running --> </activity> </application> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index eaaa73fd..c4035038 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -12,8 +12,6 @@ qtHaveModule(simulator) { QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf -ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_LIB_DEPENDENCIES = \ plugins/sensors/libqtsensors_android.so |