allow branding the UI too

This commit is contained in:
Michael Zanetti 2018-05-14 17:00:45 +02:00
parent 790f3ec976
commit 71098a9877
4 changed files with 12 additions and 3 deletions

View File

@ -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

View File

@ -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();

View File

@ -118,6 +118,10 @@ DISTFILES += \
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/../packaging/android
BR=$$BRANDING
!equals(BR, "") {
DEFINES += BRANDING=\\\"maveo\\\"
}
DISTFILES += \
$$PWD/../win-installer.nsi

View File

@ -62,6 +62,7 @@ Page {
RowLayout {
Layout.fillWidth: true
visible: appBranding.length === 0
Label {
Layout.fillWidth: true
text: "Style"