diff --git a/mea.pro b/mea.pro index 4a26016b..fb75feeb 100644 --- a/mea.pro +++ b/mea.pro @@ -19,7 +19,7 @@ BR=$$BRANDING equals(BR, "") { wininstaller.commands += makensis /DBRANDING=guh packaging\windows\win-installer.nsi } else { - wininstaller.commands += makensis /DBRANDING=BR packaging\windows\win-installer.nsi + wininstaller.commands += makensis /DBRANDING=$$BR packaging\windows\win-installer.nsi } QMAKE_EXTRA_TARGETS += wininstaller diff --git a/mea/main.cpp b/mea/main.cpp index ad4565dd..dd2e3764 100644 --- a/mea/main.cpp +++ b/mea/main.cpp @@ -158,10 +158,14 @@ int main(int argc, char *argv[]) Engine::instance(); + QQmlApplicationEngine engine; +#ifdef BRANDING + engine.rootContext()->setContextProperty("appBranding", BRANDING); + QQuickStyle::setStyle(QString(":/styles/%1").arg(BRANDING)); +#else QSettings settings; QQuickStyle::setStyle(":/styles/" + settings.value("style", "light").toString()); - - QQmlApplicationEngine engine; +#endif engine.load(QUrl(QLatin1String("qrc:/ui/main.qml"))); return application.exec(); diff --git a/mea/mea.pro b/mea/mea.pro index 31775d8c..ab3d41df 100644 --- a/mea/mea.pro +++ b/mea/mea.pro @@ -118,6 +118,10 @@ DISTFILES += \ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android +BR=$$BRANDING +!equals(BR, "") { +DEFINES += BRANDING=\\\"maveo\\\" +} DISTFILES += \ $$PWD/../win-installer.nsi diff --git a/mea/ui/SettingsPage.qml b/mea/ui/SettingsPage.qml index dbcb1b5c..99b2cc4a 100644 --- a/mea/ui/SettingsPage.qml +++ b/mea/ui/SettingsPage.qml @@ -62,6 +62,7 @@ Page { RowLayout { Layout.fillWidth: true + visible: appBranding.length === 0 Label { Layout.fillWidth: true text: "Style"