Fix nullptr tag call
Fix iOS background color
This commit is contained in:
parent
1e3171a379
commit
5948a704d2
@ -190,7 +190,6 @@ Tag* TagsManager::unpackTag(const QVariantMap &tagMap)
|
|||||||
tag->setRuleId(ruleId);
|
tag->setRuleId(ruleId);
|
||||||
} else {
|
} else {
|
||||||
qCWarning(dcTags()) << "Invalid tag. Neither thingId nor ruleId are set. Skipping...";
|
qCWarning(dcTags()) << "Invalid tag. Neither thingId nor ruleId are set. Skipping...";
|
||||||
tag->deleteLater();
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
// qDebug() << "adding tag" << tag->tagId() << tag->value();
|
// qDebug() << "adding tag" << tag->tagId() << tag->value();
|
||||||
|
|||||||
@ -54,6 +54,18 @@ ApplicationWindow {
|
|||||||
font.capitalization: Font.MixedCase
|
font.capitalization: Font.MixedCase
|
||||||
font.family: Style.fontFamily
|
font.family: Style.fontFamily
|
||||||
|
|
||||||
|
Binding {
|
||||||
|
target: PlatformHelper
|
||||||
|
property: "topPanelColor"
|
||||||
|
value: app.color
|
||||||
|
}
|
||||||
|
|
||||||
|
Binding {
|
||||||
|
target: PlatformHelper
|
||||||
|
property: "bottomPanelColor"
|
||||||
|
value: app.color
|
||||||
|
}
|
||||||
|
|
||||||
property int margins: 16
|
property int margins: 16
|
||||||
property int bigMargins: 20
|
property int bigMargins: 20
|
||||||
|
|
||||||
@ -85,8 +97,6 @@ ApplicationWindow {
|
|||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
styleController.setSystemFont(app.font)
|
styleController.setSystemFont(app.font)
|
||||||
PlatformHelper.topPanelColor = Style.backgroundColor
|
|
||||||
PlatformHelper.bottomPanelColor = Style.backgroundColor
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Binding {
|
Binding {
|
||||||
|
|||||||
Reference in New Issue
Block a user