On Sun, Aug 14, 2016 at 09:38:27PM +0200, Thomas Pfeiffer wrote:
> On 14.08.2016 06:29, Dirk Hohndel wrote:
> > I still haven't managed to make the latest Kirigami work. And I don't think
> > I'll finish that today as I'm jet lagged and about to fall asleep on my
> > keyboard. But at least our iOS testers should be able to continue to use
> > Subsurface-mobile.
> >
> Btw: Kirigami 1.0 has been released four days ago [1] and you can find the
> download link to the release tarball in our wiki [2]. We currently consider
> Kirigami on iOS "experimental" both because we don't have any iOS developers
> and because you guys are still having trouble with it on iOS.
> That said, of course we hope to get to a point where we can make the iOS
> support official, so we hope we can fix these problems together.
> Marco is currently unavailable, but will return sometime next week and will
> hopefully find time to look into this.
> The Kirigami release seems to have sparked quite some interest, so maybe
> some of the people who have offered to help us have experience with iOS
> development.
That would be nice.
Kirigami as is has a few oddities. It compiles neither with cmake nor with
qmake. Hmm.
I have patches for that, but on iOS it still dies at startup with a
BAD_ACCESS to address 0x1 when trying to loop over the
m_stylesFallbackChain in KirigamiPlugin::componentPath (we are building
static).
I have pushed what I have to Subsurface master if someone else wants to
play with this.
/D
>From 816e243f664f43d3d03601372492ff74710cf195 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <d...@hohndel.org>
Date: Sun, 14 Aug 2016 15:45:25 -0700
Subject: [PATCH 1/3] fix qmake .pro file
Signed-off-by: Dirk Hohndel <d...@hohndel.org>
---
kirigami.pro | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kirigami.pro b/kirigami.pro
index 6181287..f7d6fe6 100644
--- a/kirigami.pro
+++ b/kirigami.pro
@@ -2,8 +2,8 @@ TEMPLATE = lib
CONFIG += plugin
QT += qml quick gui svg
-HEADERS += $$PWD/src/kirigamiplugin.h
-SOURCES += $$PWD/src/kirigamiplugin.cpp
+HEADERS += $$PWD/src/kirigamiplugin.h $$PWD/src/enums.h
+SOURCES += $$PWD/src/kirigamiplugin.cpp $$PWD/src/enums.cpp
API_VER=1.0
--
2.7.4 (Apple Git-66)
>From ac40a529216ce3bee6f3f9d82a8fab190d72bc8f Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <d...@hohndel.org>
Date: Sun, 14 Aug 2016 16:29:42 -0700
Subject: [PATCH 2/3] Remove reference to non-existant file
Signed-off-by: Dirk Hohndel <d...@hohndel.org>
---
kirigami.qrc | 1 -
1 file changed, 1 deletion(-)
diff --git a/kirigami.qrc b/kirigami.qrc
index 994c104..63d64ac 100644
--- a/kirigami.qrc
+++ b/kirigami.qrc
@@ -42,7 +42,6 @@
<file alias="styles/Plasma/Theme.qml">src/styles/Plasma/Theme.qml</file>
<file alias="styles/Plasma/Units.qml">src/styles/Plasma/Units.qml</file>
<file alias="styles/Plasma/Icon.qml">src/styles/Plasma/Icon.qml</file>
- <file alias="styles/Desktop/ContextDrawer.qml">src/styles/Desktop/ContextDrawer.qml</file>
<file alias="styles/Desktop/Theme.qml">src/styles/Desktop/Theme.qml</file>
<file alias="styles/Desktop/OverlayDrawer.qml">src/styles/Desktop/OverlayDrawer.qml</file>
<file alias="styles/Desktop/Units.qml">src/styles/Desktop/Units.qml</file>
--
2.7.4 (Apple Git-66)
>From c09a57b35dff4e024147527e7ec8e0a4cd4c45c2 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <d...@hohndel.org>
Date: Sun, 14 Aug 2016 16:31:46 -0700
Subject: [PATCH 3/3] Hide non-existant cmake macro
Signed-off-by: Dirk Hohndel <d...@hohndel.org>
---
src/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1866e4e..ace207d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,8 @@
project(kirigami)
-ecm_create_qm_loader(kirigami_QM_LOADER libkirigamiplugin_qt)
+if (! STATIC_LIBRARY)
+ ecm_create_qm_loader(kirigami_QM_LOADER libkirigamiplugin_qt)
+endif()
set(kirigami_SRCS
kirigamiplugin.cpp
--
2.7.4 (Apple Git-66)
_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
