diff options
| author | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-07-08 23:19:54 +0300 |
|---|---|---|
| committer | Ilya Zverev <ilya@zverev.info> | 2017-07-10 19:29:38 +0300 |
| commit | 506c86b32474a361a80f01b41942f5df6b9fb4cc (patch) | |
| tree | 5c823c615e4ae92f7e95d9f1f6e37660dfc88cd9 /qt | |
| parent | 83a05025606a463b6c87c90d538117c7502ad281 (diff) | |
Updated protobuf to 3.3.0
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/build_style/build_common.cpp | 4 | ||||
| -rw-r--r-- | qt/build_style/build_skins.cpp | 6 | ||||
| -rw-r--r-- | qt/mainwindow.cpp | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/qt/build_style/build_common.cpp b/qt/build_style/build_common.cpp index dcf1dbafff..67bee224b9 100644 --- a/qt/build_style/build_common.cpp +++ b/qt/build_style/build_common.cpp @@ -102,12 +102,10 @@ QString GetExternalPath(QString const & name, QString const & primaryPath, if (i >= 0) path = JoinFoldersToPath({appPath.left(i), name}); } - - ASSERT(QFileInfo::exists(path), (path.toStdString())); return path; } QString GetProtobufEggPath() { - return GetExternalPath("protobuf-2.6.1-py2.7.egg", "kothic", "../protobuf"); + return GetExternalPath("protobuf-3.3.0-py2.7.egg", "kothic", "../3party/protobuf"); } diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp index 8f1fcad0be..82f713b572 100644 --- a/qt/build_style/build_skins.cpp +++ b/qt/build_style/build_skins.cpp @@ -52,7 +52,11 @@ inline bool SkinCoorrectColor(SkinType s) { return std::get<2>(g_skinInfo[s]); } QString GetSkinGeneratorPath() { - return GetExternalPath("skin_generator", "skin_generator.app/Contents/MacOS", ""); + QString path = GetExternalPath("skin_generator", "skin_generator.app/Contents/MacOS", ""); + if (path.isEmpty()) + path = GetExternalPath("skin_generator_tool", "skin_generator_tool.app/Contents/MacOS", ""); + ASSERT(QFileInfo::exists(path), (path.toStdString())); + return path; } class RAII diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp index a43ea17100..16b69cf607 100644 --- a/qt/mainwindow.cpp +++ b/qt/mainwindow.cpp @@ -22,6 +22,8 @@ #include "build_style/build_style.h" #include "build_style/build_statistics.h" #include "build_style/run_tests.h" + +#include "drape/debug_rect_renderer.hpp" #endif // BUILD_DESIGNER #include <QtGui/QCloseEvent> |