[xcode-9] Fixed desktop app build.

16 files changed, 59 insertions, 76 deletions

diff --git a/qt/build_style/build_common.cpp b/qt/build_style/build_common.cpp
index 67bee224b9..b17c3545ce 100644
--- a/qt/build_style/build_common.cpp
+++ b/qt/build_style/build_common.cpp
@@ -2,11 +2,11 @@
 
 #include "platform/platform.hpp"
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QRegExp>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QProcess>
+#include <QtCore/QRegExp>
 
 #include <exception>
 
diff --git a/qt/build_style/build_common.h b/qt/build_style/build_common.h
index 113a219a57..ca3382ae43 100644
--- a/qt/build_style/build_common.h
+++ b/qt/build_style/build_common.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QString>
-#include <QProcessEnvironment>
+#include <QtCore/QString>
+#include <QtCore/QProcessEnvironment>
 
 #include <initializer_list>
 #include <string>
diff --git a/qt/build_style/build_drules.cpp b/qt/build_style/build_drules.cpp
index 7f6ec59258..3c8a680427 100644
--- a/qt/build_style/build_drules.cpp
+++ b/qt/build_style/build_drules.cpp
@@ -7,10 +7,10 @@
 #include <fstream>
 #include <streambuf>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QStringList>
 
 namespace
 {
diff --git a/qt/build_style/build_drules.h b/qt/build_style/build_drules.h
index 61f718abe8..d9b0dba820 100644
--- a/qt/build_style/build_drules.h
+++ b/qt/build_style/build_drules.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_phone_pack.cpp b/qt/build_style/build_phone_pack.cpp
index ff91adea94..00c99d1a7c 100644
--- a/qt/build_style/build_phone_pack.cpp
+++ b/qt/build_style/build_phone_pack.cpp
@@ -4,8 +4,8 @@
 
 #include "platform/platform.hpp"
 
-#include <QDir>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QStringList>
 
 #include <exception>
 
diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp
index 82f713b572..7c576ae1f7 100644
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -11,7 +11,7 @@
 #include <utility>
 #include <fstream>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 namespace
 {
diff --git a/qt/build_style/build_skins.h b/qt/build_style/build_skins.h
index 50ca7312af..dade5701bd 100644
--- a/qt/build_style/build_skins.h
+++ b/qt/build_style/build_skins.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_statistics.cpp b/qt/build_style/build_statistics.cpp
index 0c6b3577ee..84b3a4765d 100644
--- a/qt/build_style/build_statistics.cpp
+++ b/qt/build_style/build_statistics.cpp
@@ -4,10 +4,10 @@
 
 #include "platform/platform.hpp"
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QStringList>
 
 #include <exception>
 
diff --git a/qt/build_style/build_statistics.h b/qt/build_style/build_statistics.h
index 9291f5fea7..6d59b7faca 100644
--- a/qt/build_style/build_statistics.h
+++ b/qt/build_style/build_statistics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/build_style.cpp b/qt/build_style/build_style.cpp
index 09d393da67..a22672af1c 100644
--- a/qt/build_style/build_style.cpp
+++ b/qt/build_style/build_style.cpp
@@ -11,9 +11,9 @@
 #include <exception>
 #include <future>
 
-#include <QFile>
-#include <QDir>
-#include <QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QCoreApplication>
 
 namespace
 {
diff --git a/qt/build_style/build_style.h b/qt/build_style/build_style.h
index 9b3bf45004..3a4a03f604 100644
--- a/qt/build_style/build_style.h
+++ b/qt/build_style/build_style.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 namespace build_style
 {
diff --git a/qt/build_style/run_tests.h b/qt/build_style/run_tests.h
index c3e721b807..32263708ec 100644
--- a/qt/build_style/run_tests.h
+++ b/qt/build_style/run_tests.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <utility>
 
diff --git a/qt/drape_surface.hpp b/qt/drape_surface.hpp
index af845fd36c..0e81a95eba 100644
--- a/qt/drape_surface.hpp
+++ b/qt/drape_surface.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "qt/qtoglcontextfactory.hpp"
+#include "qtoglcontextfactory.hpp"
 
 #include "map/framework.hpp"
 #include "drape_frontend/drape_engine.hpp"
diff --git a/qt/main.cpp b/qt/main.cpp
index 9e089b1025..d41c72aa19 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -20,10 +20,10 @@
 #include "3party/Alohalytics/src/alohalytics.h"
 #include "3party/gflags/src/gflags/gflags.h"
 
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include <QtCore/QDir>
 #include <QtWidgets/QApplication>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 DEFINE_string(data_path, "", "Path to data directory");
 DEFINE_string(log_abort_level, my::ToString(my::GetDefaultLogAbortLevel()),
diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index 120a2d89de..c1f9c9f17f 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -10,7 +10,7 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib
 
 // Deployment target
 IPHONEOS_DEPLOYMENT_TARGET = 8.2
-MACOSX_DEPLOYMENT_TARGET = 10.10
+MACOSX_DEPLOYMENT_TARGET = 10.12
 
 // Supported platforms
 SUPPORTED_PLATFORMS = macosx iphonesimulator iphoneos
@@ -69,3 +69,4 @@ OTHER_SWIFT_FLAGS = -Xfrontend -warn-long-function-bodies=400
 PRODUCT_NAME = $(TARGET_NAME)
 VALID_ARCHS = arm64
 VALID_ARCHS[sdk=iphonesimulator*] = x86_64
+VALID_ARCHS[sdk=macosx*] = x86_64
diff --git a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj
index a11101f6e5..0ed1967f0e 100644
--- a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj
+++ b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj
@@ -12,6 +12,9 @@
 		3462FD8F1DC1E05D00906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD8E1DC1E05D00906FD7 /* liboauthcpp.a */; };
 		3475E0DE1DBF5772004C7E69 /* libpartners_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3475E0DD1DBF5772004C7E69 /* libpartners_api.a */; };
 		3475E0E41DBF593D004C7E69 /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3475E0E31DBF593D004C7E69 /* libtracking.a */; };
+		348FE6851F7BBF7000AAA4AF /* libugc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE6861F7BBF7000AAA4AF /* libugc.a */; };
+		348FE6871F7BBF7A00AAA4AF /* libmwm_diff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */; };
+		348FE6891F7BBF9300AAA4AF /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */; };
 		34FFD3011E9CEEA20010AD12 /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2EF1E9CEEA20010AD12 /* helpers.cpp */; };
 		34FFD3021E9CEEA20010AD12 /* map_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2F11E9CEEA20010AD12 /* map_widget.cpp */; };
 		34FFD3031E9CEEA20010AD12 /* proxy_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2F31E9CEEA20010AD12 /* proxy_style.cpp */; };
@@ -19,7 +22,6 @@
 		34FFD3061E9CEEA20010AD12 /* qtoglcontextfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2F81E9CEEA20010AD12 /* qtoglcontextfactory.cpp */; };
 		34FFD3071E9CEEA20010AD12 /* minus.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FFD2FB1E9CEEA20010AD12 /* minus.png */; };
 		34FFD3081E9CEEA20010AD12 /* plus.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FFD2FC1E9CEEA20010AD12 /* plus.png */; };
-		34FFD3091E9CEEA20010AD12 /* resources_common.qrc in Resources */ = {isa = PBXBuildFile; fileRef = 34FFD2FD1E9CEEA20010AD12 /* resources_common.qrc */; };
 		34FFD30A1E9CEEA20010AD12 /* scale_slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34FFD2FE1E9CEEA20010AD12 /* scale_slider.cpp */; };
 		34FFD30D1E9CEF010010AD12 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FFD30B1E9CEF010010AD12 /* libicu.a */; };
 		34FFD30E1E9CEF010010AD12 /* liblocal_ads.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FFD30C1E9CEF010010AD12 /* liblocal_ads.a */; };
@@ -63,14 +65,7 @@
 		6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; };
 		6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6001BD14016008AB603 /* resources-mdpi_clear */; };
 		6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6011BD14016008AB603 /* resources-mdpi_dark */; };
-		671E78DC1E6A44C600B2859B /* traffic_mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D61E6A44C600B2859B /* traffic_mode.cpp */; };
-		671E78DD1E6A44C600B2859B /* traffic_panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D81E6A44C600B2859B /* traffic_panel.cpp */; };
-		671E78DE1E6A44C600B2859B /* trafficmodeinitdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */; };
-		671E78E31E6A4BE300B2859B /* trafficmodeinitdlg.ui in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */; };
 		671E78E51E6A4E1A00B2859B /* librouting_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E78E41E6A4E1A00B2859B /* librouting_common.a */; };
-		671E78E61E6A4E4A00B2859B /* traffic_mode.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D71E6A44C600B2859B /* traffic_mode.hpp */; };
-		671E78E71E6A4E4A00B2859B /* traffic_panel.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 671E78D91E6A44C600B2859B /* traffic_panel.hpp */; };
-		671E78E91E6A4F3700B2859B /* trafficmodeinitdlg.h in Sources */ = {isa = PBXBuildFile; fileRef = 671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */; };
 		671E79221E6A508600B2859B /* libopenlr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671E79211E6A508600B2859B /* libopenlr.a */; };
 		671F59021B8755FE0032311E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F59011B8755FE0032311E /* libz.dylib */; };
 		671F59301B8759460032311E /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F592F1B8759460032311E /* libminizip.a */; };
@@ -91,7 +86,6 @@
 		6729A5E51A6931CE007D5872 /* 06_code2000.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5DE1A6931CE007D5872 /* 06_code2000.ttf */; };
 		6729A5E81A69321A007D5872 /* World.mwm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5E61A69321A007D5872 /* World.mwm */; };
 		6729A5E91A69321A007D5872 /* WorldCoasts.mwm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5E71A69321A007D5872 /* WorldCoasts.mwm */; };
-		6729A6681A69394D007D5872 /* resources.qrc in Resources */ = {isa = PBXBuildFile; fileRef = 6729A6671A69394D007D5872 /* resources.qrc */; };
 		6729A6691A69395E007D5872 /* resources.qrc in Sources */ = {isa = PBXBuildFile; fileRef = 6729A6671A69394D007D5872 /* resources.qrc */; };
 		6729A66D1A695C70007D5872 /* copyright.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A66A1A695C70007D5872 /* copyright.html */; };
 		6729A66E1A695C70007D5872 /* eula.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A66B1A695C70007D5872 /* eula.html */; };
@@ -160,13 +154,13 @@
 		6729A45A1A684436007D5872 /* PBXBuildRule */ = {
 			isa = PBXBuildRule;
 			compilerSpec = com.apple.compilers.proxy.script;
-			filePatterns = "*.hpp *.h";
+			filePatterns = "*.hpp";
 			fileType = pattern.proxy;
 			isEditable = 1;
 			outputFiles = (
 				"$(DERIVED_FILE_DIR)/$(INPUT_FILE_NAME).cpp",
 			);
-			script = "/usr/local/opt/qt5/bin/moc -nn -o ${DERIVED_FILE_DIR}/${INPUT_FILE_NAME}.cpp ${SCRIPT_INPUT_FILE}\n\n";
+			script = "/usr/local/opt/qt5/bin/moc -o ${DERIVED_FILE_DIR}/${INPUT_FILE_NAME}.cpp ${SCRIPT_INPUT_FILE}\n\n";
 		};
 		6729A6661A6938AD007D5872 /* PBXBuildRule */ = {
 			isa = PBXBuildRule;
@@ -223,6 +217,9 @@
 		3462FD8E1DC1E05D00906FD7 /* liboauthcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liboauthcpp.a; path = "../../../omim-build/xcode/Release/liboauthcpp.a"; sourceTree = "<group>"; };
 		3475E0DD1DBF5772004C7E69 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-xcode-build/Debug/libpartners_api.a"; sourceTree = "<group>"; };
 		3475E0E31DBF593D004C7E69 /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "../../../omim-xcode-build/Debug/libtracking.a"; sourceTree = "<group>"; };
+		348FE6861F7BBF7000AAA4AF /* libugc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libugc.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmwm_diff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		34EBB4821DBF53D8005BE9B8 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34EBB4831DBF53D8005BE9B8 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		34FFD2EF1E9CEEA20010AD12 /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = "<group>"; };
@@ -280,13 +277,6 @@
 		6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = "<group>"; };
 		6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
 		6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = "<group>"; };
-		671E78D61E6A44C600B2859B /* traffic_mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_mode.cpp; sourceTree = "<group>"; };
-		671E78D71E6A44C600B2859B /* traffic_mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_mode.hpp; sourceTree = "<group>"; };
-		671E78D81E6A44C600B2859B /* traffic_panel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_panel.cpp; sourceTree = "<group>"; };
-		671E78D91E6A44C600B2859B /* traffic_panel.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_panel.hpp; sourceTree = "<group>"; };
-		671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trafficmodeinitdlg.cpp; sourceTree = "<group>"; };
-		671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trafficmodeinitdlg.h; sourceTree = "<group>"; };
-		671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = trafficmodeinitdlg.ui; sourceTree = "<group>"; };
 		671E78E41E6A4E1A00B2859B /* librouting_common.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting_common.a; path = "/Users/darkserj/mapsme/omim/xcode/routing_common/../../../omim-build/xcode/Debug/librouting_common.a"; sourceTree = "<absolute>"; };
 		671E79211E6A508600B2859B /* libopenlr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenlr.a; path = "/Users/darkserj/mapsme/omim/xcode/openlr/../../../omim-build/xcode/Debug/libopenlr.a"; sourceTree = "<absolute>"; };
 		671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -375,6 +365,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				348FE6891F7BBF9300AAA4AF /* libbsdiff.a in Frameworks */,
+				348FE6871F7BBF7A00AAA4AF /* libmwm_diff.a in Frameworks */,
+				348FE6851F7BBF7000AAA4AF /* libugc.a in Frameworks */,
 				34FFD30D1E9CEF010010AD12 /* libicu.a in Frameworks */,
 				34FFD30E1E9CEF010010AD12 /* liblocal_ads.a in Frameworks */,
 				671E79221E6A508600B2859B /* libopenlr.a in Frameworks */,
@@ -426,6 +419,9 @@
 		3475E0DC1DBF5772004C7E69 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				348FE68A1F7BBF9300AAA4AF /* libbsdiff.a */,
+				348FE6881F7BBF7A00AAA4AF /* libmwm_diff.a */,
+				348FE6861F7BBF7000AAA4AF /* libugc.a */,
 				34FFD30B1E9CEF010010AD12 /* libicu.a */,
 				34FFD30C1E9CEF010010AD12 /* liblocal_ads.a */,
 				671E79211E6A508600B2859B /* libopenlr.a */,
@@ -608,13 +604,6 @@
 			children = (
 				456B3F9D1EDEEAE5009B3D1F /* build_style */,
 				34FFD2ED1E9CEEA20010AD12 /* qt_common */,
-				671E78DF1E6A455D00B2859B /* trafficmodeinitdlg.ui */,
-				671E78D61E6A44C600B2859B /* traffic_mode.cpp */,
-				671E78D71E6A44C600B2859B /* traffic_mode.hpp */,
-				671E78D81E6A44C600B2859B /* traffic_panel.cpp */,
-				671E78D91E6A44C600B2859B /* traffic_panel.hpp */,
-				671E78DA1E6A44C600B2859B /* trafficmodeinitdlg.cpp */,
-				671E78DB1E6A44C600B2859B /* trafficmodeinitdlg.h */,
 				45B5B5861CA4216B00D93E36 /* create_feature_dialog.cpp */,
 				45B5B5871CA4216B00D93E36 /* create_feature_dialog.hpp */,
 				45B5B5881CA4216B00D93E36 /* place_page_dialog.cpp */,
@@ -715,7 +704,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34FFD3091E9CEEA20010AD12 /* resources_common.qrc in Resources */,
 				45B5B58F1CA4222300D93E36 /* countries-strings in Resources */,
 				45B5B59C1CA422C800D93E36 /* resources-xxhdpi_clear in Resources */,
 				45B5B5A21CA422EE00D93E36 /* resources-6plus_dark in Resources */,
@@ -730,7 +718,6 @@
 				671182DD1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
 				671182F61C80E09A00CB8177 /* colors.txt in Resources */,
 				6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */,
-				6729A6681A69394D007D5872 /* resources.qrc in Resources */,
 				45B5B5A31CA422EE00D93E36 /* resources-hdpi_dark in Resources */,
 				45B5B5A61CA422EE00D93E36 /* resources-xxhdpi_dark in Resources */,
 				45B5B59B1CA422C800D93E36 /* resources-xhdpi_clear in Resources */,
@@ -750,41 +737,34 @@
 			buildActionMask = 2147483647;
 			files = (
 				34FFD30F1E9CEF490010AD12 /* map_widget.hpp in Sources */,
-				34FFD3101E9CEF490010AD12 /* resources_common.qrc in Sources */,
-				671E78E91E6A4F3700B2859B /* trafficmodeinitdlg.h in Sources */,
-				456B3FB01EDEEB04009B3D1F /* build_statistics.cpp in Sources */,
-				671E78E61E6A4E4A00B2859B /* traffic_mode.hpp in Sources */,
-				671E78E71E6A4E4A00B2859B /* traffic_panel.hpp in Sources */,
-				671E78E31E6A4BE300B2859B /* trafficmodeinitdlg.ui in Sources */,
 				45B5B58C1CA4219C00D93E36 /* create_feature_dialog.hpp in Sources */,
 				45B5B58D1CA4219C00D93E36 /* place_page_dialog.hpp in Sources */,
-				456B3FAE1EDEEB04009B3D1F /* build_phone_pack.cpp in Sources */,
 				675340A11C528A1C002CF0D9 /* editor_dialog.hpp in Sources */,
-				456B3FAC1EDEEB04009B3D1F /* build_common.cpp in Sources */,
-				675340A21C528A1C002CF0D9 /* osm_auth_dialog.hpp in Sources */,
-				34FFD3061E9CEEA20010AD12 /* qtoglcontextfactory.cpp in Sources */,
 				670D05991B0CBD5A0013A7AC /* draw_widget.hpp in Sources */,
-				670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */,
-				670D05931B0CBD320013A7AC /* about.hpp in Sources */,
-				456B3FAF1EDEEB04009B3D1F /* build_skins.cpp in Sources */,
-				456B3FAD1EDEEB04009B3D1F /* build_drules.cpp in Sources */,
+				675340A21C528A1C002CF0D9 /* osm_auth_dialog.hpp in Sources */,
 				670D05941B0CBD320013A7AC /* info_dialog.hpp in Sources */,
+				670D05931B0CBD320013A7AC /* about.hpp in Sources */,
+				670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */,
 				670D05951B0CBD320013A7AC /* preferences_dialog.hpp in Sources */,
 				670D05961B0CBD320013A7AC /* search_panel.hpp in Sources */,
+				670D05981B0CBD320013A7AC /* update_dialog.hpp in Sources */,
+				6729A6691A69395E007D5872 /* resources.qrc in Sources */,
+				34FFD3101E9CEF490010AD12 /* resources_common.qrc in Sources */,
+				456B3FB01EDEEB04009B3D1F /* build_statistics.cpp in Sources */,
+				456B3FAE1EDEEB04009B3D1F /* build_phone_pack.cpp in Sources */,
+				456B3FAC1EDEEB04009B3D1F /* build_common.cpp in Sources */,
+				34FFD3061E9CEEA20010AD12 /* qtoglcontextfactory.cpp in Sources */,
+				456B3FAF1EDEEB04009B3D1F /* build_skins.cpp in Sources */,
+				456B3FAD1EDEEB04009B3D1F /* build_drules.cpp in Sources */,
 				34FFD3031E9CEEA20010AD12 /* proxy_style.cpp in Sources */,
 				45B5B58B1CA4216B00D93E36 /* place_page_dialog.cpp in Sources */,
 				34FFD3011E9CEEA20010AD12 /* helpers.cpp in Sources */,
-				670D05981B0CBD320013A7AC /* update_dialog.hpp in Sources */,
-				671E78DC1E6A44C600B2859B /* traffic_mode.cpp in Sources */,
 				34FFD3051E9CEEA20010AD12 /* qtoglcontext.cpp in Sources */,
-				671E78DD1E6A44C600B2859B /* traffic_panel.cpp in Sources */,
-				6729A6691A69395E007D5872 /* resources.qrc in Sources */,
 				34FFD3021E9CEEA20010AD12 /* map_widget.cpp in Sources */,
 				456B3FB11EDEEB04009B3D1F /* build_style.cpp in Sources */,
 				675345901A404CB200A0A8C3 /* search_panel.cpp in Sources */,
 				45B5B58A1CA4216B00D93E36 /* create_feature_dialog.cpp in Sources */,
 				675345861A404CB200A0A8C3 /* about.cpp in Sources */,
-				671E78DE1E6A44C600B2859B /* trafficmodeinitdlg.cpp in Sources */,
 				6753409F1C5289E0002CF0D9 /* editor_dialog.cpp in Sources */,
 				675345921A404CB200A0A8C3 /* update_dialog.cpp in Sources */,
 				6753458B1A404CB200A0A8C3 /* mainwindow.cpp in Sources */,
@@ -811,6 +791,7 @@
 					"$(QT_PATH)/include",
 					"$(OMIM_ROOT)/3party/glm",
 					"$(DERIVED_FILE_DIR)",
+					"$(OMIM_ROOT)/3party/gflags/src",
 				);
 				SUPPORTED_PLATFORMS = macosx;
 				SYMROOT = build;
@@ -828,6 +809,7 @@
 					"$(QT_PATH)/include",
 					"$(OMIM_ROOT)/3party/glm",
 					"$(DERIVED_FILE_DIR)",
+					"$(OMIM_ROOT)/3party/gflags/src",
 				);
 				SUPPORTED_PLATFORMS = macosx;
 				SYMROOT = build;