From 068d55b79d1782cefe0a7ecbdad5f620acb175b2 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Mon, 12 Feb 2018 16:16:45 +0100 Subject: [PATCH] Mobile build: new Kirigami SHA 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 --- scripts/mobilecomponents.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 72adcaae5..c2336e6d6 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -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