From 315e3c7b2c547af255c8742ca3b1e15edfb5ba88 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Tue, 12 Apr 2016 18:33:09 +0300 Subject: [PATCH] Fix build desktop application and test --- qt/search_panel.cpp | 2 +- xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj | 2 -- xcode/storage/storage.xcodeproj/project.pbxproj | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index 2077a5b0ad..347c65c853 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -227,7 +227,7 @@ bool SearchPanel::TryMigrate(QString const & str) } }; - auto const progressChanged = [](storage::TCountryId const & id, storage::TLocalAndRemoteSize const & sz) + auto const progressChanged = [](storage::TCountryId const & id, storage::MapFilesDownloader::TProgress const & sz) { LOG(LINFO, (id, "downloading progress:", sz)); }; diff --git a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj index 052410853b..1706e80a6a 100644 --- a/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj +++ b/xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 45B5B58D1CA4219C00D93E36 /* place_page_dialog.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 45B5B5891CA4216B00D93E36 /* place_page_dialog.hpp */; }; 45B5B58F1CA4222300D93E36 /* countries-strings in Resources */ = {isa = PBXBuildFile; fileRef = 45B5B58E1CA4222300D93E36 /* countries-strings */; }; 45B5B5911CA4226800D93E36 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 45B5B5901CA4226800D93E36 /* editor.config */; }; - 45B5B5921CA4227F00D93E36 /* editor.config in CopyFiles */ = {isa = PBXBuildFile; fileRef = 45B5B5901CA4226800D93E36 /* editor.config */; }; 45B5B5981CA422C800D93E36 /* resources-6plus_clear in Resources */ = {isa = PBXBuildFile; fileRef = 45B5B5931CA422C800D93E36 /* resources-6plus_clear */; }; 45B5B5991CA422C800D93E36 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 45B5B5941CA422C800D93E36 /* resources-hdpi_clear */; }; 45B5B59A1CA422C800D93E36 /* resources-ldpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 45B5B5951CA422C800D93E36 /* resources-ldpi_clear */; }; @@ -161,7 +160,6 @@ dstPath = ""; dstSubfolderSpec = 7; files = ( - 45B5B5921CA4227F00D93E36 /* editor.config in CopyFiles */, 67A461A71C2172C400B18739 /* 07_roboto_medium.ttf in CopyFiles */, 6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */, 6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */, diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index be2c252df8..499474f640 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -853,7 +853,6 @@ 67F90B6D1C6A275B00CD458E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = dwarf; @@ -875,7 +874,6 @@ 67F90B6E1C6A275B00CD458E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -895,7 +893,6 @@ 67F90BCB1C6A29F700CD458E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = dwarf; @@ -917,7 +914,6 @@ 67F90BCC1C6A29F700CD458E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO;