aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-14 10:28:24 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-14 10:28:24 +0100
commit1b47102b58f4ddcdd24e3a261a5dd258df607b58 (patch)
tree186a5be26a14637d997c272d4f953d60bd2076ff
parent9b6aeb9511150f53c46bd3927d956697d34606b3 (diff)
parent77c94d077b41439217c23c01a1a3015fcd6497d6 (diff)
Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1
-rw-r--r--dist/changes-5.10.126
-rw-r--r--src/androidextras/android/qandroidservice.cpp3
2 files changed, 28 insertions, 1 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1
new file mode 100644
index 0000000..695c4e3
--- /dev/null
+++ b/dist/changes-5.10.1
@@ -0,0 +1,26 @@
+Qt 5.10.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.10.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+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 all fixes included in the Qt 5.9.4 release.
+
+****************************************************************************
+* Qt 5.10.1 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/src/androidextras/android/qandroidservice.cpp b/src/androidextras/android/qandroidservice.cpp
index f6c68be..227787a 100644
--- a/src/androidextras/android/qandroidservice.cpp
+++ b/src/androidextras/android/qandroidservice.cpp
@@ -46,6 +46,7 @@
#include <private/qjnihelpers_p.h>
#include <QMutex>
+#include <QTimer>
#include <QSet>
QT_BEGIN_NAMESPACE
@@ -57,7 +58,7 @@ public:
: m_service(service)
, m_binder(binder)
{
- QtAndroidPrivate::setOnBindListener(this);
+ QTimer::singleShot(0,this, [this]{ QtAndroidPrivate::setOnBindListener(this);});
}
~QAndroidServicePrivate()