From 30d148931d09b6a01aef647ff8391cf38965a593 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 20 Jan 2022 12:03:33 +0100
Subject: [PATCH] Fix version.txt parsing in android builds with QtCreator >= 6

---
 nymea-app/nymea-app.pro   | 4 +++-
 packaging/android/gradlew | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 14bbb160..ddf18467 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -83,7 +83,9 @@ android {
     LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
     PRE_TARGETDEPS += $$top_builddir/libnymea-app/$${ANDROID_TARGET_ARCH}/libnymea-app.a
 
-    QMAKE_POST_LINK += $$QMAKE_COPY $$shell_path($$top_srcdir/version.txt) $$shell_path($$top_builddir/)
+    versioninfo.files = ../version.txt
+    versioninfo.path = /
+    INSTALLS += versioninfo
 
     DISTFILES += \
         $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
diff --git a/packaging/android/gradlew b/packaging/android/gradlew
index ad459ad2..19e11908 100755
--- a/packaging/android/gradlew
+++ b/packaging/android/gradlew
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 BASEDIR=$(dirname "$0")
-NYMEA_APP_VERSION=`cat $BASEDIR/../version.txt | head -n 1`
-NYMEA_APP_VERSION_CODE=`cat $BASEDIR/../version.txt | head -n 2 | tail -n 1`
+NYMEA_APP_VERSION=`cat $BASEDIR/version.txt | head -n 1`
+NYMEA_APP_VERSION_CODE=`cat $BASEDIR/version.txt | head -n 2 | tail -n 1`
 echo "Setting version to $NYMEA_APP_VERSION ($NYMEA_APP_VERSION_CODE)"
 sed -i "s/android:versionName=\"[0-9\.a-zA-Z_]*\"/android:versionName=\"$NYMEA_APP_VERSION\"/" AndroidManifest.xml
 sed -i "s/android:versionCode=\"[0-9]*\"/android:versionCode=\"$NYMEA_APP_VERSION_CODE\"/" AndroidManifest.xml