refactor: making core a QApplication (so it runs cocoa loop on macOS)
This commit is contained in:
parent
c4f11942e4
commit
1854e469f4
2 changed files with 6 additions and 6 deletions
|
|
@ -36,6 +36,7 @@ target_link_libraries(
|
||||||
platform
|
platform
|
||||||
server
|
server
|
||||||
app
|
app
|
||||||
|
Qt6::Widgets
|
||||||
${libs})
|
${libs})
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,9 @@
|
||||||
|
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
#include "arch/win32/ArchMiscWindows.h"
|
#include "arch/win32/ArchMiscWindows.h"
|
||||||
#include <QCoreApplication>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QApplication>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
|
@ -102,17 +101,17 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
App *coreApp = createApp(parser, events, processName);
|
App *coreApp = createApp(parser, events, processName);
|
||||||
|
|
||||||
QCoreApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
QCoreApplication::setApplicationName(QStringLiteral("%1 Core").arg(kAppName));
|
QApplication::setApplicationName(QStringLiteral("%1 Core").arg(kAppName));
|
||||||
|
|
||||||
const auto ipcServer = new deskflow::core::ipc::CoreIpcServer(&app); // NOSONAR - Qt managed
|
const auto ipcServer = new deskflow::core::ipc::CoreIpcServer(&app); // NOSONAR - Qt managed
|
||||||
ipcServer->listen();
|
ipcServer->listen();
|
||||||
|
|
||||||
QThread coreThread;
|
QThread coreThread;
|
||||||
QObject::connect(&coreThread, &QThread::finished, &app, &QCoreApplication::quit);
|
QObject::connect(&coreThread, &QThread::finished, &app, &QApplication::quit);
|
||||||
coreApp->run(coreThread);
|
coreApp->run(coreThread);
|
||||||
|
|
||||||
const auto exitCode = QCoreApplication::exec();
|
const auto exitCode = QApplication::exec();
|
||||||
coreThread.wait();
|
coreThread.wait();
|
||||||
|
|
||||||
LOG_DEBUG("core exited, code: %d", exitCode);
|
LOG_DEBUG("core exited, code: %d", exitCode);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue