From 52a922d862eae951ebdd3e2709995e1fbf953c46 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 7 Jun 2018 12:56:03 +0200
Subject: [PATCH] try to use our own plist again

---
 mea/mea.pro                 | 13 +++++++++++++
 packaging/ios/Info.plist.in |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mea/mea.pro b/mea/mea.pro
index b8b15a72..da9450f5 100644
--- a/mea/mea.pro
+++ b/mea/mea.pro
@@ -44,6 +44,18 @@ android {
         $$ANDROID_PACKAGE_SOURCE_DIR/LICENSE
 }
 
+BR=$$BRANDING
+!equals(BR, "") {
+    DEFINES += BRANDING=\\\"$${BR}\\\"
+    win32:RCC_ICONS += ../packaging/windows_$${BR}/packages/io.guh.$${BR}/meta/logo.ico
+} else {
+    win32:RCC_ICONS += ../packaging/windows/packages/io.guh.mea/meta/logo.ico
+}
+
+withavahi: {
+    LIBS += -lavahi-client -lavahi-common
+}
+
 macx: {
     PRODUCT_NAME=mea
     plist.input = ../packaging/osx/Info.plist.in
@@ -55,6 +67,7 @@ macx: {
 }
 
 ios: {
+    QMAKE_TARGET_BUNDLE_PREFIX = "io.guh"
     plist.input = ../packaging/ios/Info.plist.in
     plist.output = $$OUT_PWD/Info.plist
     QMAKE_SUBSTITUTES += plist
diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in
index c9265af5..95f2a07a 100644
--- a/packaging/ios/Info.plist.in
+++ b/packaging/ios/Info.plist.in
@@ -11,7 +11,7 @@
 	<key>CFBundleIconFile</key>
 	<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
 	<key>CFBundleIdentifier</key>
-        <string>io.guh.${PRODUCT_BUNDLE_IDENTIFIER}</string>
+        <string>@BUNDLEIDENTIFIER@</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>