Android: don't directly access m_qtThread member
Task-number: QTBUG-118077 Change-Id: I2103483a2bfa8abe9be832790611b07a5d011f76 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
parent
c0eca51570
commit
5ab2b8b951
@ -147,7 +147,7 @@ public class QtActivityBase extends Activity
|
||||
if (!m_retainNonConfigurationInstance) {
|
||||
QtNative.terminateQt();
|
||||
QtNative.setActivity(null);
|
||||
QtNative.m_qtThread.exit();
|
||||
QtNative.getQtThread().exit();
|
||||
System.exit(0);
|
||||
}
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ public class QtApplicationBase extends Application {
|
||||
@Override
|
||||
public void onTerminate() {
|
||||
QtNative.terminateQt();
|
||||
QtNative.m_qtThread.exit();
|
||||
QtNative.getQtThread().exit();
|
||||
super.onTerminate();
|
||||
}
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ public class QtNative
|
||||
private static final ArrayList<Runnable> m_lostActions = new ArrayList<>();
|
||||
private static boolean m_started = false;
|
||||
|
||||
public static QtThread m_qtThread = new QtThread();
|
||||
private static final QtThread m_qtThread = new QtThread();
|
||||
private static ClassLoader m_classLoader = null;
|
||||
|
||||
private static final Runnable runPendingCppRunnablesRunnable = new Runnable() {
|
||||
|
@ -35,7 +35,7 @@ public class QtServiceBase extends Service {
|
||||
QtNative.quitQtCoreApplication();
|
||||
QtNative.terminateQt();
|
||||
QtNative.setService(null);
|
||||
QtNative.m_qtThread.exit();
|
||||
QtNative.getQtThread().exit();
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user