From 0a5ec75073138bf44ac94547d89f53a40a56e08d Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 28 Mar 2021 16:30:41 +0200 Subject: [PATCH] Fix firebase path --- config.pri | 2 -- nymea-app/nymea-app.pro | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.pri b/config.pri index c7b74d3b..289057c5 100644 --- a/config.pri +++ b/config.pri @@ -21,8 +21,6 @@ linux:!android { android: { QMAKE_CXXFLAGS += -Wno-deprecated-declarations - QMAKE_POST_LINK += $$QMAKE_COPY $$shell_path($$top_srcdir/version.txt) $$shell_path($$top_builddir/) - !equals(OVERLAY_PATH, ""):!equals(BRANDING, "") { ANDROID_PACKAGE_SOURCE_DIR = $${OVERLAY_PATH}/packaging/android_$$BRANDING } else { diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 328e48c8..661d29fe 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -66,6 +66,8 @@ 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/) + DISTFILES += \ $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \ $$ANDROID_PACKAGE_SOURCE_DIR/google-services.json \