patches pushed to master

[Axel Richter]

Am 09.07.2016 um 22:05 schrieb Dirk Hohndel:
> Quick update... as some may have noticed, I have a new job and the first
> two weeks kept me rather busy... so I haven't paid any attention here,
> haven't even read the emails.
>
> I know, Linus keeps saying job #1 of a maintainer is to be responsive. So
> for the last month or two I have sucked as a maintainer. Guilty as charged.
>
> I'd love to promise that it will be all better now, but that would be
> silly because it won't. Next week Linus and I will be in Tokyo. That may
> actually mean that I'll have at least SOME time to look at Subsurface. So
> if you have patches that I have overlooked, if you have things that you
> want my opinion on, now may be a great time to (re-)send those.
>
> The following week we'll be on a liveaboard with no phone or internet.
> That means that Subsurface will likely get some critical testing, but of
> course it also means another week with the maintainer absent from the
> mailing list :-(
>
> Quick request:
>
> Rick / Robert, can you please check that I got everything applied for the
> planner changes and that things work as expected?
>
> Anton, do I have all your patches for Android?
>
> Has anyone figured out the new Kirigami stuff?
>
> /D

Hi Dirk,

Qt 5.7 and kirigami works for the android build with the 
following patch:

diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc

index 6983533..1c56e94 100644

--- a/mobile-widgets/qml/mobile-resources.qrc

+++ b/mobile-widgets/qml/mobile-resources.qrc

@@ -24,7 +24,6 @@

          <file alias="nocloud.svg">icons/nocloud.svg</file>

      </qresource>

      <qresource prefix="/imports">

-        <file alias="org/kde/kirigami/qmldir">kirigami/qmldir</file>

          <file alias="org/kde/kirigami/Action.qml">kirigami/Action.qml</file>

          <file alias="org/kde/kirigami/ApplicationWindow.qml">kirigami/ApplicationWindow.qml</file>

          <file alias="org/kde/kirigami/BasicListItem.qml">kirigami/BasicListItem.qml</file>

diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh

index ec1e97f..27c8e7f 100755

--- a/scripts/mobilecomponents.sh

+++ b/scripts/mobilecomponents.sh

@@ -44,13 +44,14 @@ fi

  

  # now copy the components and a couple of icons into plae

  MC=$SRC/subsurface/mobile-widgets/qml/kirigami

-PMMC=kirigami/src/qml

+# PMMC=kirigami/src/qml

+PMMC=kirigami/src/controls

  BREEZE=breeze-icons

  

  rm -rf $MC

  mkdir -p $MC/icons

  cp -R $PMMC/* $MC/

-cp $PMMC/../fallbacktheme/*qml $MC/

+cp -R $PMMC/templates/* $MC/

  

  # fix plugin requirement

  sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $MC/qmldir


Regards,
Axel.


-- 
------------------------------------------------------------

Axel Richter
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160709/450e595f/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tsc-signatur.jpg
Type: image/jpeg
Size: 48793 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160709/450e595f/attachment-0001.jpg>