status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: abort startup on QML errors 

exit() the app immediately after encountering QML errors on startup

task: status-im/status-desktop#7013
This commit is contained in:
Lukáš Tinkl 2022-08-15 11:01:19 +02:00 committed by Michał
parent eac67137c0
commit ec90b2107d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/DOtherSide/lib/src/DOtherSide.cpp vendored
View File

@ -343,6 +343,15 @@ void dos_qqmlapplicationengine_setNetworkAccessManagerFactory(::DosQQmlApplicati
void dos_qqmlapplicationengine_load(::DosQQmlApplicationEngine *vptr, const char *filename) void dos_qqmlapplicationengine_load(::DosQQmlApplicationEngine *vptr, const char *filename)
{ {
auto engine = static_cast<QQmlApplicationEngine *>(vptr); auto engine = static_cast<QQmlApplicationEngine *>(vptr);
QObject::connect(
engine, &QQmlApplicationEngine::objectCreated, qGuiApp,
[](QObject *obj, const QUrl &objUrl) {
if (!obj) {
qWarning() << "Error while loading QML:" << objUrl;
QCoreApplication::exit(EXIT_FAILURE);
}
},
Qt::QueuedConnection);
engine->load(QUrl::fromLocalFile(QGuiApplication::applicationDirPath() + QDir::separator() + QString(filename))); engine->load(QUrl::fromLocalFile(QGuiApplication::applicationDirPath() + QDir::separator() + QString(filename)));
} }
@ -350,6 +359,15 @@ void dos_qqmlapplicationengine_load_url(::DosQQmlApplicationEngine *vptr, ::DosQ
{ {
auto engine = static_cast<QQmlApplicationEngine *>(vptr); auto engine = static_cast<QQmlApplicationEngine *>(vptr);
auto qurl = static_cast<QUrl *>(url); auto qurl = static_cast<QUrl *>(url);
QObject::connect(
engine, &QQmlApplicationEngine::objectCreated, qGuiApp,
[](QObject *obj, const QUrl &objUrl) {
if (!obj) {
qWarning() << "Error while loading QML:" << objUrl;
QCoreApplication::exit(EXIT_FAILURE);
}
},
Qt::QueuedConnection);
engine->load(*qurl); engine->load(*qurl);
} }