Commit 007d8fdf authored by Volker Krause's avatar Volker Krause
Browse files

Merge branch 'release/21.04'

# Conflicts:
#	CMakeLists.txt
#	src/app/main.cpp
parents 992b8dfb 96d4a1cc
......@@ -105,6 +105,7 @@ Kirigami.ScrollablePage {
// optional bottom row: notes if present
QQC2.Label {
Layout.columnSpan: 2
Layout.fillWidth: true
text: departure.notes.join("<br/>")
textFormat: Text.RichText
wrapMode: Text.Wrap
......
......@@ -205,6 +205,7 @@ int main(int argc, char **argv)
QQuickStyle::setStyle(QStringLiteral("Material"));
#else
QApplication app(argc, argv); // for native file dialogs
// Default to org.kde.desktop style unless the user forces another style
if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {
QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment