mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile build: new Kirigami SHA

Browse source 
While most new commits are QML improvements, there is a change
in the Kirigami build related to static building (like we do),
and Cmake restyles to make things more Qt compliant.

As now the (generated) qrc_kirigami.cpp is included from
kirigamiplugin.cpp, for static builds, our build failes on
double defined symbols.

Following commit deals with this fail.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-02-12 16:16:45 +01:00
parent d4eb2ba1a1
commit 068d55b79d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/mobilecomponents.sh
View file

@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then
git checkout master
git pull origin master
# if we want to pin a specific Kirigami version, we can do this here
git checkout 3606ef16375f9deb132565463d1ab11cea2548df
git checkout 3023536f809b165eb90300aa356407f4079c6507
popd
fi
if [ ! -d breeze-icons ] ; then