diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-25 14:13:29 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 17207917868476622b00656fc5f139ae126b90ff (patch) | |
| tree | 15ac5c136cb0fa173ba714e06363b86fd720d260 /mobile-widgets/3rdparty/0010-don-t-use-yet.patch | |
| parent | 3c89964d797ea11fbeff18ead576a46f576a91e5 (diff) | |
| download | subsurface-17207917868476622b00656fc5f139ae126b90ff.tar.gz | |
kirigami: maintain our patches relative to upstream
Having them as commits like this should make it easier to migrate them
as we update the underlying Kirigami version.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/3rdparty/0010-don-t-use-yet.patch')
| -rw-r--r-- | mobile-widgets/3rdparty/0010-don-t-use-yet.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mobile-widgets/3rdparty/0010-don-t-use-yet.patch b/mobile-widgets/3rdparty/0010-don-t-use-yet.patch new file mode 100644 index 000000000..adc48d69a --- /dev/null +++ b/mobile-widgets/3rdparty/0010-don-t-use-yet.patch @@ -0,0 +1,26 @@ +From 4c364152dcff6de56c8356922f48c2c069c71ef2 Mon Sep 17 00:00:00 2001 +From: Marco Martin <notmart@gmail.com> +Date: Mon, 14 Dec 2020 11:07:06 +0100 +Subject: [PATCH 10/11] don't use ?? yet + +--- + src/controls/AbstractApplicationItem.qml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/controls/AbstractApplicationItem.qml b/src/controls/AbstractApplicationItem.qml +index 718ecd6e..fecc431a 100644 +--- a/src/controls/AbstractApplicationItem.qml ++++ b/src/controls/AbstractApplicationItem.qml +@@ -191,7 +191,8 @@ Item { + menuBar.position = T.DialogButtonBox.Footer + } + menuBar.width = Qt.binding(() => root.contentItem.width) +- menuBar.y = Qt.binding(() => -menuBar.height - (root.header.height ?? 0)) ++ //FIXME: (root.header.height ?? 0) when we can depend from 5.15 ++ menuBar.y = Qt.binding(() => -menuBar.height - (root.header.height ? root.header.height : 0)) + } + + /** +-- +2.25.1 + |