mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "build-system: fix kirigami.pri for iOS build"

Browse source 
Turns out that Jan found an issue with the latest Kirigami, so let's go back to
the known good one.

This reverts commit 40766db459.

Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-28 14:51:54 -07:00
parent 56b24707a5
commit e99df4af2c
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
scripts/kirigami.diff
View file

@ -1,25 +1,6 @@
diff -ur a/kirigami/kirigami.pri kirigami.pri
--- kirigami.pri 2018-08-24 13:27:24.000000000 -0700
+++ kirigami.pri 2018-09-27 09:02:36.000000000 -0700
@@ -5,6 +5,7 @@
$$PWD/src/settings.h \
$$PWD/src/formlayoutattached.h \
$$PWD/src/mnemonicattached.h \
+ $$PWD/src/scenepositionattached.h \
$$PWD/src/libkirigami/basictheme_p.h \
$$PWD/src/libkirigami/platformtheme.h \
$$PWD/src/libkirigami/kirigamipluginfactory.h \
@@ -16,6 +16,7 @@
$$PWD/src/settings.cpp \
$$PWD/src/formlayoutattached.cpp \
$$PWD/src/mnemonicattached.cpp \
+ $$PWD/src/scenepositionattached.cpp \
$$PWD/src/libkirigami/basictheme.cpp \
$$PWD/src/libkirigami/platformtheme.cpp \
$$PWD/src/libkirigami/kirigamipluginfactory.cpp \
diff -ur a/kirigami/src/controls/GlobalDrawer.qml src/controls/GlobalDrawer.qml
--- src/controls/GlobalDrawer.qml 2018-09-27 08:43:36.000000000 -0700
+++ src/controls/GlobalDrawer.qml 2018-09-27 09:01:41.000000000 -0700
diff -ur ../kirigami/src/controls/GlobalDrawer.qml mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml
--- ../kirigami/src/controls/GlobalDrawer.qml 2018-09-27 15:27:32.340600738 +0200
+++ src/controls/GlobalDrawer.qml 2018-09-27 16:45:29.689438950 +0200
@@ -328,17 +328,13 @@
ColumnLayout {
id: topContent