qt: Replace QCoreApplication::quit() with QCoreApplication::exit(0)
Qt 5: - no behavior change Qt 6: - this change avoids sending a duplicated `QEvent::Quit`
This commit is contained in:
2 files changed
+4
-2
No files matched your search
+3
-1
@@ -308,7 +308,9 @@ void BitcoinApplication::startThread()
|
|||||||
|
|
||||||
/* communication to and from thread */
|
/* communication to and from thread */
|
||||||
connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult);
|
connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult);
|
||||||
connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &QCoreApplication::quit);
|
connect(&m_executor.value(), &InitExecutor::shutdownResult, this, [] {
|
||||||
|
QCoreApplication::exit(0);
|
||||||
|
});
|
||||||
connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException);
|
connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException);
|
||||||
connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize);
|
connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize);
|
||||||
connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown);
|
connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown);
|
||||||
|
|||||||
@@ -119,6 +119,6 @@ AppTests::HandleCallback::~HandleCallback()
|
|||||||
assert(it != callbacks.end());
|
assert(it != callbacks.end());
|
||||||
callbacks.erase(it);
|
callbacks.erase(it);
|
||||||
if (callbacks.empty()) {
|
if (callbacks.empty()) {
|
||||||
m_app_tests.m_app.quit();
|
m_app_tests.m_app.exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user