From f45a4623de6b9532fcb1695e481afef2e1ff9634 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Fri, 25 Dec 2015 17:10:07 +0300 Subject: [PATCH] Restored qmake call for all Android and iOS builds to fix build errors when switching branches in git. --- tools/autobuild/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh index 09d9a115fe..a38e02e4ef 100644 --- a/tools/autobuild/build.sh +++ b/tools/autobuild/build.sh @@ -50,10 +50,10 @@ BuildQt() { mkdir -p "$SHADOW_DIR" cd "$SHADOW_DIR" - if [ ! -f "$SHADOW_DIR/Makefile" ]; then - echo "Launching qmake..." - "$QMAKE" CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro" - fi + echo "Launching qmake..." + # This call is needed to correctly rebuild c++ sources after switching between branches with added or removed source files. + # Otherwise we get build errors. + "$QMAKE" -r CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro" # make clean > /dev/null || true make -j $(GetCPUCores) )