From e507b123b5d3584ed112123606a95f0ff456c748 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Thu, 15 Feb 2018 10:44:13 +0100 Subject: 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 --- scripts/mobilecomponents.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'scripts') 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 /\/\/#include /" src/kirigamiplugin.cpp popd echo org.kde.plasma.kirigami synced from upstream -- cgit v1.2.3-70-g09d2