gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[qt] Fixed qt5 compilation errors

Browse source
This commit is contained in:
Alex Zolotarev 2013-07-31 13:29:56 +02:00 • committed by Alex Zolotarev
parent 0d3255fc85
commit 77505198d6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map_server/main.cpp
View file

@ -20,10 +20,16 @@
#include "../../3party/gflags/src/gflags/gflags.h"
#include <QtOpenGL/QGLPixelBuffer>
#include <QtGui/QApplication>
#include <QtCore/QBuffer>
#include <QtCore/QFile>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QtGui/QApplication>
#else
#include <QtWidgets/QApplication>
#endif
DEFINE_uint64(texture_size, 2560, "Texture size");
DEFINE_string(listen, "/tmp/mwm-render-socket",
"Path to socket to be listened");
@ -76,7 +82,7 @@ QString MwmRpcService::RenderBox(
// Settings::SetCurrentLanguage(string(language.toAscii()));
graphics::EDensity requestDensity;
graphics::convert(density.toAscii(), requestDensity);
graphics::convert(density.toUtf8(), requestDensity);
if (m_framework.GetRenderPolicy()->Density() != requestDensity)
{
m_rpParams.m_density = requestDensity;