From 043cc3623ae4a22557b7c9738d3c7e6d5cabbb0a Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 1 Jul 2017 15:09:23 +0300 Subject: Fixed qmake build --- qt/mainwindow.hpp | 12 +++++------ qt/qt.pro | 62 +++++++++++++++++++++++-------------------------------- 2 files changed, 32 insertions(+), 42 deletions(-) (limited to 'qt') diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp index 425243c7ec..7fe028aef9 100644 --- a/qt/mainwindow.hpp +++ b/qt/mainwindow.hpp @@ -125,12 +125,12 @@ protected Q_SLOTS: void OnClearRoute(); #ifdef BUILD_DESIGNER - void OnBuildStyle(); - void OnRecalculateGeomIndex(); - void OnDebugStyle(); - void OnGetStatistics(); - void OnRunTests(); - void OnBuildPhonePackage(); + void OnBuildStyle(); + void OnRecalculateGeomIndex(); + void OnDebugStyle(); + void OnGetStatistics(); + void OnRunTests(); + void OnBuildPhonePackage(); #endif // BUILD_DESIGNER }; } // namespace qt diff --git a/qt/qt.pro b/qt/qt.pro index 2ad6fceb32..e6bc2ffa8e 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -19,6 +19,11 @@ map_designer { } map_designer { + RM_MDPI = $$system(rm -rf $$PWD/../data/resources-mdpi_design) + RM_HDPI = $$system(rm -rf $$PWD/../data/resources-hdpi_design) + RM_XHDPI = $$system(rm -rf $$PWD/../data/resources-xhdpi_design) + RM_XXHDPI = $$system(rm -rf $$PWD/../data/resources-xxhdpi_design) + RM_6PLUS = $$system(rm -rf $$PWD/../data/resources-6plus_design) CP_MDPI = $$system(cp -rf $$PWD/../data/resources-mdpi_clear $$PWD/../data/resources-mdpi_design) CP_HDPI = $$system(cp -rf $$PWD/../data/resources-hdpi_clear $$PWD/../data/resources-hdpi_design) CP_XHDPI = $$system(cp -rf $$PWD/../data/resources-xhdpi_clear $$PWD/../data/resources-xhdpi_design) @@ -92,58 +97,43 @@ CLASSIFICATOR_RES.path = $$DATADIR CLASSIFICATOR_RES.files = ../data/classificator.txt \ ../data/types.txt \ ../data/drules_proto_clear.bin + DEFAULT_SKIN_RES.path = $$DATADIR/resources-default DEFAULT_SKIN_RES.files = ../resources-default/default.ui -MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi_clear -MDPI_SKIN_RES.files = ../data/resources-mdpi_clear/symbols.sdf ../data/resources-mdpi_clear/symbols.png -XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi_clear -XHDPI_SKIN_RES.files = ../data/resources-xhdpi_clear/symbols.sdf ../data/resources-xhdpi_clear/symbols.png + +!map_designer { + MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi_clear + MDPI_SKIN_RES.files = ../data/resources-mdpi_clear/ + + XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi_clear + XHDPI_SKIN_RES.files = ../data/resources-xhdpi_clear/ +} map_designer { DESIGN_TOOL_RES.path = $$DATADIR DESIGN_TOOL_RES.files = ../data/drules_proto_design.bin \ ../data/colors_design.txt \ - ../data/patterns_design.txt + ../data/patterns_design.txt \ + ../data/mapcss-dynamic.txt \ + ../data/mapcss-mapping.csv DESIGN_TOOL_MDPI_RES.path = $$DATADIR/resources-mdpi_design - DESIGN_TOOL_MDPI_RES.files = ../data/resources-mdpi_design/symbols.png \ - ../data/resources-mdpi_design/symbols.sdf \ - ../data/resources-mdpi_design/symbols-ad.png \ - ../data/resources-mdpi_design/symbols-ad.sdf \ - ../data/resources-mdpi_design/area-hatching.png \ - ../data/resources-mdpi_design/traffic-arrow.png + DESIGN_TOOL_MDPI_RES.files = ../data/resources-mdpi_design/ DESIGN_TOOL_HDPI_RES.path = $$DATADIR/resources-hdpi_design - DESIGN_TOOL_HDPI_RES.files = ../data/resources-hdpi_design/symbols.png \ - ../data/resources-hdpi_design/symbols.sdf \ - ../data/resources-hdpi_design/symbols-ad.png \ - ../data/resources-hdpi_design/symbols-ad.sdf \ - ../data/resources-hdpi_design/area-hatching.png \ - ../data/resources-hdpi_design/traffic-arrow.png + DESIGN_TOOL_HDPI_RES.files = ../data/resources-hdpi_design/ DESIGN_TOOL_XHDPI_RES.path = $$DATADIR/resources-xhdpi_design - DESIGN_TOOL_XHDPI_RES.files = ../data/resources-xhdpi_design/symbols.png \ - ../data/resources-xhdpi_design/symbols.sdf \ - ../data/resources-xhdpi_design/symbols-ad.png \ - ../data/resources-xhdpi_design/symbols-ad.sdf \ - ../data/resources-xhdpi_design/area-hatching.png \ - ../data/resources-xhdpi_design/traffic-arrow.png + DESIGN_TOOL_XHDPI_RES.files = ../data/resources-xhdpi_design/ DESIGN_TOOL_XXHDPI_RES.path = $$DATADIR/resources-xxhdpi_design - DESIGN_TOOL_XXHDPI_RES.files = ../data/resources-xxhdpi_design/symbols.png \ - ../data/resources-xxhdpi_design/symbols.sdf \ - ../data/resources-xxhdpi_design/symbols-ad.png \ - ../data/resources-xxhdpi_design/symbols-ad.sdf \ - ../data/resources-xxhdpi_design/area-hatching.png \ - ../data/resources-xxhdpi_design/traffic-arrow.png + DESIGN_TOOL_XXHDPI_RES.files = ../data/resources-xxhdpi_design/ DESIGN_TOOL_6PLUS_RES.path = $$DATADIR/resources-6plus_design - DESIGN_TOOL_6PLUS_RES.files = ../data/resources-6plus_design/symbols.png \ - ../data/resources-6plus_design/symbols.sdf \ - ../data/resources-6plus_design/symbols-ad.png \ - ../data/resources-6plus_design/symbols-ad.sdf \ - ../data/resources-6plus_design/area-hatching.png \ - ../data/resources-6plus_design/traffic-arrow.png + DESIGN_TOOL_6PLUS_RES.files = ../data/resources-6plus_design/ + + COUNTRIES_STRINGS_RES.path = $$DATADIR/countries-strings + COUNTRIES_STRINGS_RES.files = ../data/countries-strings/ } FONT_RES.path = $$FONTSDIR @@ -168,7 +158,7 @@ MWM_RES.files = ../data/World.mwm ../data/WorldCoasts.mwm ALL_RESOURCES = OTHER_RES CLASSIFICATOR_RES MDPI_SKIN_RES XHDPI_SKIN_RES FONT_RES MWM_RES ICU_RES map_designer { ALL_RESOURCES += DESIGN_TOOL_RES DESIGN_TOOL_MDPI_RES DESIGN_TOOL_HDPI_RES DESIGN_TOOL_XHDPI_RES \ - DESIGN_TOOL_XXHDPI_RES DESIGN_TOOL_6PLUS_RES + DESIGN_TOOL_XXHDPI_RES DESIGN_TOOL_6PLUS_RES COUNTRIES_STRINGS_RES } #ALL_RESOURCES += DEFAULT_SKIN_RES -- cgit v1.2.3