diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-02-15 10:44:13 +0100 |
|---|---|---|
| committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-02-15 21:23:28 +0100 |
| commit | e507b123b5d3584ed112123606a95f0ff456c748 (patch) | |
| tree | 64a14813aeefbf5b4866316b92f02a743a4b71d8 | |
| parent | 068d55b79d1782cefe0a7ecbdad5f620acb175b2 (diff) | |
| download | subsurface-e507b123b5d3584ed112123606a95f0ff456c748.tar.gz | |
Mobile: fix build after new Kirigami sha
This is definitely a hack.
Do not include the Kirigami resources (on static build). It causes
double defined symbols in our setting. I would like a nicer fix for this
issue, but failed to find one. For example, not adding the resource in
our build causes the qrc file not to be generated. Manual generation
of the resource file (using rcc) introduces the double symbols again.
so it seems some Kirigami weirdness (but their staticcmake example compiles
correctly).
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rwxr-xr-x | scripts/mobilecomponents.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index c2336e6d6..3f4e5f31e 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -73,9 +73,20 @@ cp $BREEZE/icons/actions/22/overflow-menu.svg $MC/icons # kirigami now needs the breeze-icons internally as well pushd $MC ln -s $SRC/$BREEZE . + +# do not show the action buttons when the keyboard is open sed -i -e "s/visible: root.action/visible: root.action \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml sed -i -e "s/visible: root.leftAction/visible: root.leftAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml sed -i -e "s/visible: root.rightAction/visible: root.rightAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml + +# another hack. Do not include the Kirigami resources (on static build). It causes +# double defined symbols in our setting. I would like a nicer fix for this +# issue, but failed to find one. For example, not adding the resource in +# our build causes the qrc file not to be generated. Manual generation +# of the resource file (using rcc) introduces the double symbols again. +# so it seems some Kirigami weirdness (but their staticcmake example compiles +# correctly). +sed -i -e "s/#include <qrc_kirigami.cpp>/\/\/#include <qrc_kirigami.cpp>/" src/kirigamiplugin.cpp popd echo org.kde.plasma.kirigami synced from upstream |