Am 01.07.2016 um 11:27 schrieb Willem Ferguson:
On 30/06/2016 21:53, Anton Lundin wrote:
You're not on latest master.
You're missing 2c60e87b09f8bbef8031622cf3537b954809a829
//Anton
Thanks, that was very useful. The build process gets much
further along than previously.
However, there is still an error with the latest master.
Looks for Kirigami/qmldir. I am not sure if this is due to
me not setting up the software correctly (very likely) or
whether there is another reason.
Any suggestions?
Kind regards,
willem
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Hi Willem,
that did it for me:
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
Axel.
--
------------------------------------------------------------
Axel Richter
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
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
