diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2017-09-12 17:59:21 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2017-09-13 16:25:15 +0300 |
commit | 2e461cd29250b4cf6ee90448d49a879e471634cc (patch) | |
tree | 18c112722db87fd277a3e233d74257f7a32bf356 /qt | |
parent | 3c2db1e05c9fa91e9ed195e5b11ecb51a9b22a7a (diff) |
Download diffs
Diffstat (limited to 'qt')
-rw-r--r-- | qt/CMakeLists.txt | 1 | ||||
-rw-r--r-- | qt/qt.pro | 6 | ||||
-rw-r--r-- | qt/update_dialog.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 70a1874779..56e4093e34 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -77,6 +77,7 @@ omim_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${RES_SOURCES} ${SRC}) omim_link_libraries( ${PROJECT_NAME} qt_common + mwm_diff map drape_frontend routing @@ -1,9 +1,9 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = qt_common map drape_frontend openlr routing search storage tracking traffic routing_common \ - ugc indexer drape partners_api local_ads platform editor geometry \ - coding base freetype expat gflags jansson protobuf osrm stats_client \ +DEPENDENCIES = qt_common map drape_frontend openlr routing search storage tracking traffic \ + routing_common ugc indexer drape partners_api local_ads platform editor mwm_diff \ + geometry coding base freetype expat gflags jansson protobuf osrm stats_client \ minizip succinct pugixml oauthcpp stb_image sdf_image icu DEPENDENCIES += opening_hours \ diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp index 1fe2d25a99..774aa02d08 100644 --- a/qt/update_dialog.cpp +++ b/qt/update_dialog.cpp @@ -139,7 +139,7 @@ namespace qt QAbstractButton * const res = ask.clickedButton(); if (res == btnUpdate) - st.DownloadNode(countryId); + st.UpdateNode(countryId); else if (res == btnDelete) { if (!m_framework.HasUnsavedEdits(countryId) || DeleteNotUploadedEditsConfirmation()) |