correctly build on android

2 files changed, 41 insertions, 36 deletions

diff --git a/qt-mobile/qml/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc
index 1039e9c32..f3fe82e08 100644
--- a/qt-mobile/qml/mobile-resources.qrc
+++ b/qt-mobile/qml/mobile-resources.qrc
@@ -24,36 +24,41 @@
 		<file alias="menu-back.png">icons/menu-back.png</file>
 	</qresource>
 	<qresource prefix="/imports">
-		<file alias="org/kde/plasma/mobilecomponents/qmldir">mobilecomponents/qmldir</file>
-		<file alias="org/kde/plasma/mobilecomponents/ActionGroup.qml">mobilecomponents/ActionGroup.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/ApplicationWindow.qml">mobilecomponents/ApplicationWindow.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/BasicListItem.qml">mobilecomponents/BasicListItem.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/GlobalDrawer.qml">mobilecomponents/GlobalDrawer.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/ContextDrawer.qml">mobilecomponents/ContextDrawer.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Page.qml">mobilecomponents/Page.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Icon.qml">mobilecomponents/Icon.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Heading.qml">mobilecomponents/Heading.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/PageRow.qml">mobilecomponents/PageRow.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Label.qml">mobilecomponents/Label.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/ListItem.qml">mobilecomponents/ListItem.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/ListItemWithActions.qml">mobilecomponents/ListItemWithActions.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/OverlayDrawer.qml">mobilecomponents/OverlayDrawer.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Theme.qml">mobilecomponents/Theme.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/Units.qml">mobilecomponents/Units.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/private/ActionButton.qml">mobilecomponents/private/ActionButton.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/private/ActionButtonArrow.qml">mobilecomponents/private/ActionButtonArrow.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/private/AbstractDrawer.qml">mobilecomponents/private/AbstractDrawer.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/private/PageStack.js">mobilecomponents/private/PageStack.js</file>
-		<file alias="org/kde/plasma/mobilecomponents/private/PassiveNotification.qml">mobilecomponents/private/PassiveNotification.qml</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/go-next.svg">mobilecomponents/icons/go-next.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/go-previous.svg">mobilecomponents/icons/go-previous.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/distribute-horizontal-x.svg">mobilecomponents/icons/distribute-horizontal-x.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/document-edit.svg">mobilecomponents/icons/document-edit.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/document-save.svg">mobilecomponents/icons/document-save.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/view-readermode.svg">mobilecomponents/icons/view-readermode.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/dialog-cancel.svg">mobilecomponents/icons/dialog-cancel.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/application-menu.svg">mobilecomponents/icons/application-menu.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/gps.svg">mobilecomponents/icons/gps.svg</file>
-		<file alias="org/kde/plasma/mobilecomponents/icons/trash-empty.svg">mobilecomponents/icons/trash-empty.svg</file>
+		<file alias="org/kde/kirigami/qmldir">mobilecomponents/qmldir</file>
+		<file alias="org/kde/kirigami/Action.qml">mobilecomponents/Action.qml</file>
+		<file alias="org/kde/kirigami/ApplicationWindow.qml">mobilecomponents/ApplicationWindow.qml</file>
+		<file alias="org/kde/kirigami/BasicListItem.qml">mobilecomponents/BasicListItem.qml</file>
+		<file alias="org/kde/kirigami/GlobalDrawer.qml">mobilecomponents/GlobalDrawer.qml</file>
+		<file alias="org/kde/kirigami/ContextDrawer.qml">mobilecomponents/ContextDrawer.qml</file>
+		<file alias="org/kde/kirigami/Page.qml">mobilecomponents/Page.qml</file>
+		<file alias="org/kde/kirigami/ScrollablePage.qml">mobilecomponents/ScrollablePage.qml</file>
+		<file alias="org/kde/kirigami/Icon.qml">mobilecomponents/Icon.qml</file>
+		<file alias="org/kde/kirigami/Heading.qml">mobilecomponents/Heading.qml</file>
+		<file alias="org/kde/kirigami/OverlaySheet.qml">mobilecomponents/OverlaySheet.qml</file>
+		<file alias="org/kde/kirigami/ApplicationHeader.qml">mobilecomponents/ApplicationHeader.qml</file>
+		<file alias="org/kde/kirigami/private/PageRow.qml">mobilecomponents/private/PageRow.qml</file>
+		<file alias="org/kde/kirigami/Label.qml">mobilecomponents/Label.qml</file>
+		<file alias="org/kde/kirigami/AbstractListItem.qml">mobilecomponents/AbstractListItem.qml</file>
+		<file alias="org/kde/kirigami/ActionsForListItem.qml">mobilecomponents/ActionsForListItem.qml</file>
+		<file alias="org/kde/kirigami/OverlayDrawer.qml">mobilecomponents/OverlayDrawer.qml</file>
+		<file alias="org/kde/kirigami/Theme.qml">mobilecomponents/Theme.qml</file>
+		<file alias="org/kde/kirigami/Units.qml">mobilecomponents/Units.qml</file>
+		<file alias="org/kde/kirigami/private/RefreshableScrollView.qml">mobilecomponents/private/RefreshableScrollView.qml</file>
+		<file alias="org/kde/kirigami/private/ActionButton.qml">mobilecomponents/private/ActionButton.qml</file>
+		<file alias="org/kde/kirigami/private/MenuIcon.qml">mobilecomponents/private/MenuIcon.qml</file>
+		<file alias="org/kde/kirigami/private/ContextIcon.qml">mobilecomponents/private/ContextIcon.qml</file>
+		<file alias="org/kde/kirigami/private/AbstractDrawer.qml">mobilecomponents/private/AbstractDrawer.qml</file>
+		<file alias="org/kde/kirigami/private/PageStack.js">mobilecomponents/private/PageStack.js</file>
+		<file alias="org/kde/kirigami/private/PassiveNotification.qml">mobilecomponents/private/PassiveNotification.qml</file>
+		<file alias="org/kde/kirigami/icons/go-next.svg">mobilecomponents/icons/go-next.svg</file>
+		<file alias="org/kde/kirigami/icons/go-previous.svg">mobilecomponents/icons/go-previous.svg</file>
+		<file alias="org/kde/kirigami/icons/distribute-horizontal-x.svg">mobilecomponents/icons/distribute-horizontal-x.svg</file>
+		<file alias="org/kde/kirigami/icons/document-edit.svg">mobilecomponents/icons/document-edit.svg</file>
+		<file alias="org/kde/kirigami/icons/document-save.svg">mobilecomponents/icons/document-save.svg</file>
+		<file alias="org/kde/kirigami/icons/view-readermode.svg">mobilecomponents/icons/view-readermode.svg</file>
+		<file alias="org/kde/kirigami/icons/dialog-cancel.svg">mobilecomponents/icons/dialog-cancel.svg</file>
+		<file alias="org/kde/kirigami/icons/application-menu.svg">mobilecomponents/icons/application-menu.svg</file>
+		<file alias="org/kde/kirigami/icons/gps.svg">mobilecomponents/icons/gps.svg</file>
+		<file alias="org/kde/kirigami/icons/trash-empty.svg">mobilecomponents/icons/trash-empty.svg</file>
 	</qresource>
 </RCC>
diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh
index 590481468..6d535fa26 100755
--- a/scripts/mobilecomponents.sh
+++ b/scripts/mobilecomponents.sh
@@ -14,17 +14,17 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core
 	exit 1
 fi
 
-# now bring in the latest Plasma-mobile mobile components plus a couple of icons that we need
+# now bring in the latest Kirigami mobile components plus a couple of icons that we need
 # first, get the latest from upstream
 # yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way
 # we stop having to manually merge our code with upstream all the time
 # as we get closer to shipping a production version we'll likely check out specific tags
 # or SHAs from upstream
 cd $SRC
-if [ ! -d plasma-mobile ] ; then
-	git clone git://github.com/KDE/plasma-mobile
+if [ ! -d kirigami ] ; then
+	git clone git://github.com/KDE/kirigami
 fi
-pushd plasma-mobile
+pushd kirigami
 git pull
 popd
 if [ ! -d breeze-icons ] ; then
@@ -36,7 +36,7 @@ popd
 
 # now copy the components and a couple of icons into plae
 MC=$SRC/subsurface/qt-mobile/qml/mobilecomponents
-PMMC=plasma-mobile/components/mobilecomponents
+PMMC=kirigami/src
 BREEZE=breeze-icons
 
 rm -rf $MC