diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 14:51:54 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-09-28 14:51:54 -0700 |
| commit | e99df4af2cf9d5a94797107b8e221b7dbe89ea78 (patch) | |
| tree | c936f251051fc1827eaf30f6157558cdf894aafa /scripts | |
| parent | 56b24707a542e8f10c8df579cd857b9526450856 (diff) | |
| download | subsurface-e99df4af2cf9d5a94797107b8e221b7dbe89ea78.tar.gz | |
Revert "build-system: fix kirigami.pri for iOS build"
Turns out that Jan found an issue with the latest Kirigami, so let's go back to
the known good one.
This reverts commit 40766db459b219ef6a9b861593ac6e7b71519ec6.
Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kirigami.diff | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/scripts/kirigami.diff b/scripts/kirigami.diff index e712326d9..49027d23f 100644 --- a/scripts/kirigami.diff +++ b/scripts/kirigami.diff @@ -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 |