Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-19 16:46:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1669: QML files are now bundled in a Qt resource file. [skip-ci]

Browse Source
This commit is contained in:
Xavier Michelon
2022-07-05 15:43:25 +02:00
committed by Jakub
parent c11fe3e1ab
commit 7a633ee8c8
3 changed files with 123 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/frontend/qt6/main.cpp
View File

@ -66,8 +66,7 @@ void initLog()
//****************************************************************************************************************************************************
QQmlComponent *createRootQmlComponent(QQmlApplicationEngine &engine)
{
/// \todo GODT-1669 pack QML and resources in QRC resource file.
QDir qmlDir("qml");
QString const qrcQmlDir = "qrc:/qml";
qmlRegisterType<QMLBackend>("CppBackend", 1, 0, "QMLBackend");
qmlRegisterType<UserList>("CppBackend", 1, 0, "UserList");
@ -75,13 +74,13 @@ QQmlComponent *createRootQmlComponent(QQmlApplicationEngine &engine)
auto rootComponent = new QQmlComponent(&engine, &engine);
engine.addImportPath(qmlDir.absolutePath());
engine.addPluginPath(qmlDir.absolutePath());
engine.addImportPath(qrcQmlDir);
engine.addPluginPath(qrcQmlDir);
QQuickStyle::addStylePath(qmlDir.absolutePath());
QQuickStyle::addStylePath(qrcQmlDir);
QQuickStyle::setStyle("Proton");
rootComponent->loadUrl(qmlDir.absoluteFilePath("Bridge.qml"));
rootComponent->loadUrl(QUrl(qrcQmlDir + "/Bridge.qml"));
if (rootComponent->status() != QQmlComponent::Status::Ready)
throw Exception("Could not load QML component");