correctly build on android

This commit is contained in:
Marco Martin 2016-03-10 14:40:19 +01:00
parent c780cfd7ce
commit 2480f21e5b
2 changed files with 41 additions and 36 deletions

View file

@ -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