Fixed qmake build

7 files changed, 39 insertions, 87 deletions

diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro
index 501f96e369..41fa8a943b 100644
--- a/generator/generator_tool/generator_tool.pro
+++ b/generator/generator_tool/generator_tool.pro
@@ -10,7 +10,7 @@ include($$ROOT_DIR/common.pri)
 INCLUDEPATH *= $$ROOT_DIR/3party/gflags/src
 
 CONFIG += console warn_on
-!map_designer_standalone {
+!CONFIG(map_designer_standalone) {
   CONFIG -= app_bundle
 }
 TEMPLATE = app
diff --git a/map/style_tests/style_tests.pro b/map/style_tests/style_tests.pro
index b6343496c3..550e57a3b5 100644
--- a/map/style_tests/style_tests.pro
+++ b/map/style_tests/style_tests.pro
@@ -2,7 +2,7 @@ TARGET = style_tests
 TEMPLATE = app
 CONFIG += console warn_on
 
-!map_designer_standalone {
+!CONFIG(map_designer_standalone) {
   CONFIG -= app_bundle
 }
 
diff --git a/omim.pro b/omim.pro
index 79e7bc728c..03a4cb9996 100644
--- a/omim.pro
+++ b/omim.pro
@@ -23,6 +23,10 @@ HEADERS += defines.hpp
   CONFIG *= desktop
 }
 
+CONFIG(map_designer_standalone) {
+  CONFIG += map_designer
+}
+
 SUBDIRS = 3party base coding geometry editor indexer routing routing_common search openlr
 
 !CONFIG(osrm) {
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
 
diff --git a/skin_generator/.qmake.stash b/skin_generator/.qmake.stash
deleted file mode 100644
index 87d4f2aa93..0000000000
--- a/skin_generator/.qmake.stash
+++ /dev/null
@@ -1,42 +0,0 @@
-QMAKE_MAC_SDK.macosx.Path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
-QMAKE_MAC_SDK.macosx.PlatformPath = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
-QMAKE_MAC_SDK.macosx.SDKVersion = 10.12
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_FIX_RPATH = \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool \
-    -id
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_AR = \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar \
-    cq
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_RANLIB = \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib \
-    -s
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_SHLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_ACTOOL = /Applications/Xcode.app/Contents/Developer/usr/bin/actool
-QMAKE_CXX.INCDIRS = \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.1.0/include \
-    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include \
-    /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include
-QMAKE_CXX.LIBDIRS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib
-QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
-QMAKE_CXX.QMAKE_APPLE_CC = 6000
-QMAKE_CXX.QMAKE_APPLE_CLANG_MAJOR_VERSION = 8
-QMAKE_CXX.QMAKE_APPLE_CLANG_MINOR_VERSION = 1
-QMAKE_CXX.QMAKE_APPLE_CLANG_PATCH_VERSION = 0
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 4
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 2
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 1
-QMAKE_CXX.COMPILER_MACROS = \
-    QT_COMPILER_STDCXX \
-    QMAKE_APPLE_CC \
-    QMAKE_APPLE_CLANG_MAJOR_VERSION \
-    QMAKE_APPLE_CLANG_MINOR_VERSION \
-    QMAKE_APPLE_CLANG_PATCH_VERSION \
-    QMAKE_GCC_MAJOR_VERSION \
-    QMAKE_GCC_MINOR_VERSION \
-    QMAKE_GCC_PATCH_VERSION
-QMAKE_XCODE_DEVELOPER_PATH = /Applications/Xcode.app/Contents/Developer
-QMAKE_XCODE_VERSION = 8.3.2
diff --git a/skin_generator/skin_generator.pro b/skin_generator/skin_generator.pro
index acd56a1400..a7370f4212 100644
--- a/skin_generator/skin_generator.pro
+++ b/skin_generator/skin_generator.pro
@@ -2,7 +2,7 @@ TARGET = skin_generator
 TEMPLATE = app
 CONFIG += console
 
-!map_designer_standalone {
+!CONFIG(map_designer_standalone) {
   CONFIG -= app_bundle
 }