aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 14:02:11 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 14:02:11 +0200
commita943ae881a897f0bacfdda94725a2bfd6028766e (patch)
tree8deb65f29d688e8dbf5b3d920ac740a57611aa2f
parentaa346dcc8d8fbab9f5877d4822c06a92f521ce7b (diff)
parent455cddd68ff84ba54509bf7676f9b02bddb7d214 (diff)
Merge remote-tracking branch 'origin/5.15.0' into 5.15
-rw-r--r--dist/changes-5.15.020
-rw-r--r--src/androidextras/android/qandroidbinder.cpp6
-rw-r--r--src/androidextras/android/qandroidintent.cpp4
-rw-r--r--src/androidextras/android/qandroidparcel.cpp4
-rw-r--r--src/androidextras/android/qandroidservice.cpp4
-rw-r--r--src/androidextras/android/qandroidserviceconnection.cpp4
-rw-r--r--src/androidextras/jni/qandroidjnienvironment.cpp1
7 files changed, 38 insertions, 5 deletions
diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
new file mode 100644
index 0000000..2aad19b
--- /dev/null
+++ b/dist/changes-5.15.0
@@ -0,0 +1,20 @@
+Qt 5.15 introduces many new features and improvements as well as bugfixes
+over the 5.14.x series. 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.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+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 a new example: Qt JNI Messenger.
+
+ - Minor code improvements.
diff --git a/src/androidextras/android/qandroidbinder.cpp b/src/androidextras/android/qandroidbinder.cpp
index 76ae57a..1639454 100644
--- a/src/androidextras/android/qandroidbinder.cpp
+++ b/src/androidextras/android/qandroidbinder.cpp
@@ -72,8 +72,12 @@ QAndroidBinderPrivate::~QAndroidBinderPrivate()
/*!
\class QAndroidBinder
\inmodule QtAndroidExtras
+ \brief Wraps the most important methods of Android Binder class.
+
The QAndroidBinder is a convenience class that wraps the most important
- \l {https://developer.android.com/reference/android/os/Binder.html} {Android Binder} methods.
+ \l {https://developer.android.com/reference/android/os/Binder.html}{Android Binder}
+ methods.
+
\since 5.10
*/
diff --git a/src/androidextras/android/qandroidintent.cpp b/src/androidextras/android/qandroidintent.cpp
index ee6accf..9c0fecb 100644
--- a/src/androidextras/android/qandroidintent.cpp
+++ b/src/androidextras/android/qandroidintent.cpp
@@ -50,9 +50,11 @@ QT_BEGIN_NAMESPACE
/*!
\class QAndroidIntent
\inmodule QtAndroidExtras
+ \brief Wraps the most important methods of Android Intent class.
The QAndroidIntent is a convenience class that wraps the most important
- \l {https://developer.android.com/reference/android/content/Intent.html} {Android Intent} methods.
+ \l {https://developer.android.com/reference/android/content/Intent.html}{Android Intent}
+ methods.
\since 5.10
*/
diff --git a/src/androidextras/android/qandroidparcel.cpp b/src/androidextras/android/qandroidparcel.cpp
index c2e80a0..6923f87 100644
--- a/src/androidextras/android/qandroidparcel.cpp
+++ b/src/androidextras/android/qandroidparcel.cpp
@@ -132,9 +132,11 @@ QAndroidBinder QAndroidParcelPrivate::readBinder() const
/*!
\class QAndroidParcel
\inmodule QtAndroidExtras
+ \brief Wraps the most important methods of Android Parcel class.
The QAndroidParcel is a convenience class that wraps the most important
- \l {https://developer.android.com/reference/android/os/Parcel.html} {Android Parcel} methods.
+ \l {https://developer.android.com/reference/android/os/Parcel.html}{Android Parcel}
+ methods.
\since 5.10
*/
diff --git a/src/androidextras/android/qandroidservice.cpp b/src/androidextras/android/qandroidservice.cpp
index 5359e0f..331f04a 100644
--- a/src/androidextras/android/qandroidservice.cpp
+++ b/src/androidextras/android/qandroidservice.cpp
@@ -105,9 +105,11 @@ public:
/*!
\class QAndroidService
\inmodule QtAndroidExtras
+ \brief Wraps the most important methods of Android Service class.
The QAndroidService is a convenience class that wraps the most important
- \l {https://developer.android.com/reference/android/app/Service.html} {Android Service} methods.
+ \l {https://developer.android.com/reference/android/app/Service.html}{Android Service}
+ methods.
\since 5.10
*/
diff --git a/src/androidextras/android/qandroidserviceconnection.cpp b/src/androidextras/android/qandroidserviceconnection.cpp
index fb4f3da..57e61a2 100644
--- a/src/androidextras/android/qandroidserviceconnection.cpp
+++ b/src/androidextras/android/qandroidserviceconnection.cpp
@@ -46,9 +46,11 @@ QT_BEGIN_NAMESPACE
/*!
\class QAndroidServiceConnection
\inmodule QtAndroidExtras
+ \brief Wraps the most important methods of Android ServiceConnection class.
The QAndroidServiceConnection is a convenience abstract class which wraps the
- \l {https://developer.android.com/reference/android/content/ServiceConnection.html} {Android ServiceConnection} interface.
+ \l {https://developer.android.com/reference/android/content/ServiceConnection.html}{Android ServiceConnection}
+ interface.
It is useful when you perform a QtAndroid::bindService operation.
diff --git a/src/androidextras/jni/qandroidjnienvironment.cpp b/src/androidextras/jni/qandroidjnienvironment.cpp
index 585c442..85db472 100644
--- a/src/androidextras/jni/qandroidjnienvironment.cpp
+++ b/src/androidextras/jni/qandroidjnienvironment.cpp
@@ -139,6 +139,7 @@ static void clearException(bool silent)
/*!
\class QAndroidJniExceptionCleaner
\inmodule QtAndroidExtras
+ \brief Cleans pending JNI exceptions.
The QAndroidJniExceptionCleaner is a convenience class useful to clean
the pending JNI exceptions from the current scope.