diff options
| author | Petri Virkkunen <petri.virkkunen@qt.io> | 2024-02-15 10:04:48 +0200 |
|---|---|---|
| committer | Petri Virkkunen <petri.virkkunen@qt.io> | 2024-04-30 22:17:04 +0300 |
| commit | b43341f6780941beb54616734d3a7b00b59b63a5 (patch) | |
| tree | cdf2b3a995b65e36a7827a60a486532bae7fc534 /src | |
| parent | aa1e658755289f52c61c1e9f2ab1bec6f214b6a4 (diff) | |
Android: Do not wait for service onBind() in service embedding path
When embedding QML into an Android service, Qt is not actually running
as a service. Avoid checking for QtAndroid::Service() and assuming that
means we are running as a service.
Task-number: QTBUG-118874
Change-Id: I5eea32b9fc200c4f34f1507d591aa1a483849118
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 960f8ffc9c..9fdcf3936b 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -441,7 +441,7 @@ static void waitForServiceSetup(JNIEnv *env, jclass /*clazz*/) Q_UNUSED(env); // The service must wait until the QCoreApplication starts otherwise onBind will be // called too early - if (QtAndroidPrivate::service().isValid()) + if (QtAndroidPrivate::service().isValid() && QtAndroid::isQtApplication()) QtAndroidPrivate::waitForServiceSetup(); } |