From 9062b8a1e84d8ab6d4fcdfe8255471eac9a2d8df Mon Sep 17 00:00:00 2001
From: Sergey Yershov <yershov@corp.mail.ru>
Date: Wed, 23 Sep 2015 14:19:33 +0300
Subject: [PATCH] Fix Xcode projects warnings

---
 xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj   | 7 ++++++-
 xcode/MapsMe/MapsMe/Info.plist                  | 2 +-
 xcode/minizip/minizip.xcodeproj/project.pbxproj | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
index bbbada0342..450e4e238c 100644
--- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
+++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
@@ -472,7 +472,7 @@
 		675345411A404C6100A0A8C3 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = maps.me;
 				TargetAttributes = {
 					675345481A404C6100A0A8C3 = {
@@ -564,6 +564,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -603,6 +604,7 @@
 				);
 				SDKROOT = macosx;
 				SYMROOT = build;
+				WARNING_CFLAGS = "-Wno-inconsistent-missing-override";
 			};
 			name = Debug;
 		};
@@ -661,6 +663,7 @@
 				);
 				SDKROOT = macosx;
 				SYMROOT = build;
+				WARNING_CFLAGS = "-Wno-inconsistent-missing-override";
 			};
 			name = Release;
 		};
@@ -674,6 +677,7 @@
 				INFOPLIST_FILE = MapsMe/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug";
+				PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -693,6 +697,7 @@
 				INFOPLIST_FILE = MapsMe/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "/Volumes/AltHD/omim/xcode/minizip/../../../omim-xcode-build/Debug";
+				PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/xcode/MapsMe/MapsMe/Info.plist b/xcode/MapsMe/MapsMe/Info.plist
index 6c40d4f1c9..f68b9d9ee0 100644
--- a/xcode/MapsMe/MapsMe/Info.plist
+++ b/xcode/MapsMe/MapsMe/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>mail.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj
index 5f9a30346e..28cca701fb 100644
--- a/xcode/minizip/minizip.xcodeproj/project.pbxproj
+++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj
@@ -246,6 +246,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -254,6 +255,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -277,6 +279,7 @@
 				671F59121B87568D0032311E /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};