Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qt/about.cpp20
-rw-r--r--qt/about.hpp7
-rw-r--r--qt/draw_widget.cpp31
-rw-r--r--qt/info_dialog.cpp19
-rw-r--r--qt/info_dialog.hpp7
-rw-r--r--qt/main.cpp8
-rw-r--r--qt/mainwindow.cpp19
-rw-r--r--qt/mainwindow.hpp8
-rw-r--r--qt/preferences_dialog.cpp31
-rw-r--r--qt/preferences_dialog.hpp7
-rw-r--r--qt/proxystyle.hpp8
-rw-r--r--qt/search_panel.cpp61
-rw-r--r--qt/search_panel.hpp6
-rw-r--r--qt/slider_ctrl.hpp7
-rw-r--r--qt/update_dialog.cpp33
-rw-r--r--qt/update_dialog.hpp7
-rw-r--r--qt_tstfrm/gl_test_widget.hpp7
17 files changed, 186 insertions, 100 deletions
diff --git a/qt/about.cpp b/qt/about.cpp
index c147e4dac0..7e3c56abf1 100644
--- a/qt/about.cpp
+++ b/qt/about.cpp
@@ -6,13 +6,19 @@
#include <QtGui/QIcon>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QTextBrowser>
-
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QMenuBar>
+ #include <QtGui/QHBoxLayout>
+ #include <QtGui/QVBoxLayout>
+ #include <QtGui/QLabel>
+ #include <QtGui/QTextBrowser>
+#else
+ #include <QtWidgets/QMenuBar>
+ #include <QtWidgets/QHBoxLayout>
+ #include <QtWidgets/QVBoxLayout>
+ #include <QtWidgets/QLabel>
+ #include <QtWidgets/QTextBrowser>
+#endif
AboutDialog::AboutDialog(QWidget * parent)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
diff --git a/qt/about.hpp b/qt/about.hpp
index 882fe69173..819982d636 100644
--- a/qt/about.hpp
+++ b/qt/about.hpp
@@ -1,6 +1,11 @@
#pragma once
-#include <QtWidgets/QDialog>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QDialog>
+#else
+ #include <QtWidgets/QDialog>
+#endif
class AboutDialog : public QDialog
{
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 3f5608ca6b..a98b8ea032 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -17,10 +17,15 @@
#include <QtGui/QMouseEvent>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QMenu>
+ #include <QtGui/QApplication>
+ #include <QtGui/QDesktopWidget>
+#else
+ #include <QtWidgets/QMenu>
+ #include <QtWidgets/QApplication>
+ #include <QtWidgets/QDesktopWidget>
+#endif
namespace qt
{
@@ -244,10 +249,23 @@ namespace qt
RenderPolicy::Params rpParams;
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ rpParams.m_screenWidth = QApplication::desktop()->geometry().width();
+ rpParams.m_screenHeight = QApplication::desktop()->geometry().height();
+ if (QApplication::desktop()->physicalDpiX() < 180)
+ rpParams.m_density = graphics::EDensityMDPI;
+ else
+ rpParams.m_density = graphics::EDensityXHDPI;
+#else
m_ratio = dynamic_cast<QApplication *>(qApp)->devicePixelRatio();
QRect const & geometry = QApplication::desktop()->geometry();
rpParams.m_screenWidth = L2D(geometry.width());
rpParams.m_screenHeight = L2D(geometry.height());
+ if (m_ratio > 1.5)
+ rpParams.m_density = graphics::EDensityXHDPI;
+ else
+ rpParams.m_density = graphics::EDensityMDPI;
+#endif
rpParams.m_videoTimer = m_videoTimer.get();
rpParams.m_useDefaultFB = true;
@@ -255,11 +273,6 @@ namespace qt
rpParams.m_primaryRC = primaryRC;
rpParams.m_skinName = "basic.skn";
- if (m_ratio > 1.5)
- rpParams.m_density = graphics::EDensityXHDPI;
- else
- rpParams.m_density = graphics::EDensityMDPI;
-
try
{
m_framework->SetRenderPolicy(CreateRenderPolicy(rpParams));
diff --git a/qt/info_dialog.cpp b/qt/info_dialog.cpp
index 87d7d1f6b6..bb524ea7e1 100644
--- a/qt/info_dialog.cpp
+++ b/qt/info_dialog.cpp
@@ -4,12 +4,19 @@
#include <QtGui/QIcon>
-#include <QtWidgets/QTextBrowser>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QLabel>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QTextBrowser>
+ #include <QtGui/QPushButton>
+ #include <QtGui/QHBoxLayout>
+ #include <QtGui/QVBoxLayout>
+ #include <QtGui/QLabel>
+#else
+ #include <QtWidgets/QTextBrowser>
+ #include <QtWidgets/QPushButton>
+ #include <QtWidgets/QHBoxLayout>
+ #include <QtWidgets/QVBoxLayout>
+ #include <QtWidgets/QLabel>
+#endif
namespace qt
{
diff --git a/qt/info_dialog.hpp b/qt/info_dialog.hpp
index c7b5327506..3618bccd97 100644
--- a/qt/info_dialog.hpp
+++ b/qt/info_dialog.hpp
@@ -1,6 +1,11 @@
#pragma once
-#include <QtWidgets/QDialog>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QDialog>
+#else
+ #include <QtWidgets/QDialog>
+#endif
namespace qt
{
diff --git a/qt/main.cpp b/qt/main.cpp
index 12643b229b..401a44500e 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -14,9 +14,11 @@
#include <QtCore/QLocale>
-#include <QtWidgets/QApplication>
-
-//#include <google/protobuf/stubs/common.h>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QApplication>
+#else
+ #include <QtWidgets/QApplication>
+#endif
namespace
{
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index ab177bfee7..2804066920 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -14,11 +14,20 @@
#include <QtGui/QCloseEvent>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QDockWidget>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QToolBar>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QAction>
+ #include <QtGui/QDockWidget>
+ #include <QtGui/QMenu>
+ #include <QtGui/QMenuBar>
+ #include <QtGui/QToolBar>
+#else
+ #include <QtWidgets/QAction>
+ #include <QtWidgets/QDockWidget>
+ #include <QtWidgets/QMenu>
+ #include <QtWidgets/QMenuBar>
+ #include <QtWidgets/QToolBar>
+#endif
+
#define IDM_ABOUT_DIALOG 1001
#define IDM_PREFERENCES_DIALOG 1002
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index 5f37d65898..7b27abe1e5 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -4,7 +4,13 @@
#include "../std/scoped_ptr.hpp"
-#include <QtWidgets/QMainWindow>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QMainWindow>
+#else
+ #include <QtWidgets/QMainWindow>
+#endif
+
class QDockWidget;
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 6ec5983352..ded4eeaabb 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -4,16 +4,27 @@
#include <QtGui/QIcon>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QTableWidget>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QRadioButton>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QCheckBox>
+ #include <QtGui/QHBoxLayout>
+ #include <QtGui/QVBoxLayout>
+ #include <QtGui/QTableWidget>
+ #include <QtGui/QHeaderView>
+ #include <QtGui/QPushButton>
+ #include <QtGui/QGroupBox>
+ #include <QtGui/QButtonGroup>
+ #include <QtGui/QRadioButton>
+#else
+ #include <QtWidgets/QCheckBox>
+ #include <QtWidgets/QHBoxLayout>
+ #include <QtWidgets/QVBoxLayout>
+ #include <QtWidgets/QTableWidget>
+ #include <QtWidgets/QHeaderView>
+ #include <QtWidgets/QPushButton>
+ #include <QtWidgets/QGroupBox>
+ #include <QtWidgets/QButtonGroup>
+ #include <QtWidgets/QRadioButton>
+#endif
namespace qt
{
diff --git a/qt/preferences_dialog.hpp b/qt/preferences_dialog.hpp
index cd36bd728d..0cc277a3ee 100644
--- a/qt/preferences_dialog.hpp
+++ b/qt/preferences_dialog.hpp
@@ -1,6 +1,11 @@
#pragma once
-#include <QtWidgets/QDialog>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QDialog>
+#else
+ #include <QtWidgets/QDialog>
+#endif
class QTableWidget;
class QButtonGroup;
diff --git a/qt/proxystyle.hpp b/qt/proxystyle.hpp
index 57ecc63392..2f4c0e0e72 100644
--- a/qt/proxystyle.hpp
+++ b/qt/proxystyle.hpp
@@ -1,6 +1,12 @@
#pragma once
-#include <QtWidgets/QStyle>
+#include <QtGui>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QStyle>
+#else
+ #include <QtWidgets/QStyle>
+#endif
+
class ProxyStyle : public QStyle
{
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 6e7b2e4514..d057de3b6f 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -9,13 +9,21 @@
#include <QtGui/QBitmap>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QTableWidget>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QPushButton>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QHeaderView>
+ #include <QtGui/QTableWidget>
+ #include <QtGui/QLineEdit>
+ #include <QtGui/QVBoxLayout>
+ #include <QtGui/QHBoxLayout>
+ #include <QtGui/QPushButton>
+#else
+ #include <QtWidgets/QHeaderView>
+ #include <QtWidgets/QTableWidget>
+ #include <QtWidgets/QLineEdit>
+ #include <QtWidgets/QVBoxLayout>
+ #include <QtWidgets/QHBoxLayout>
+ #include <QtWidgets/QPushButton>
+#endif
namespace qt
{
@@ -34,7 +42,12 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent)
m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows);
m_pTable->verticalHeader()->setVisible(false);
m_pTable->horizontalHeader()->setVisible(false);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ m_pTable->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+#else
m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#endif
+
connect(m_pTable, SIGNAL(cellClicked(int, int)), this, SLOT(OnSearchPanelItemClicked(int,int)));
m_pClearButton = new QPushButton(this);
@@ -72,40 +85,6 @@ namespace
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
return item;
}
-
- /*
- QIcon draw_direction(double a)
- {
- int const dim = 64;
-
- QPixmap pm(dim, dim);
-
- QBitmap mask(dim, dim);
- mask.clear();
- pm.setMask(mask);
-
- QPainter painter(&pm);
- painter.setBackgroundMode(Qt::TransparentMode);
-
- QMatrix m;
- m.translate(dim/2, dim/2);
- m.rotate(-a / math::pi * 180.0);
- m.translate(-dim/2, -dim/2);
-
- typedef QPointF P;
- QPolygonF poly(5);
- poly[0] = P(dim/3, dim/2);
- poly[1] = P(0, dim/2 - dim/3);
- poly[2] = P(dim, dim/2);
- poly[3] = P(0, dim/2 + dim/3);
- poly[4] = P(dim/3, dim/2);
-
- painter.setBrush(Qt::black);
- painter.drawPolygon(m.map(poly));
-
- return pm;
- }
- */
}
void SearchPanel::OnSearchResult(ResultsT * res)
diff --git a/qt/search_panel.hpp b/qt/search_panel.hpp
index ab23a2acb6..816ad54306 100644
--- a/qt/search_panel.hpp
+++ b/qt/search_panel.hpp
@@ -7,7 +7,11 @@
#include <QtGui/QPixmap>
-#include <QtWidgets/QWidget>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QWidget>
+#else
+ #include <QtWidgets/QWidget>
+#endif
class QTableWidget;
class QLineEdit;
diff --git a/qt/slider_ctrl.hpp b/qt/slider_ctrl.hpp
index 2113a1f0fc..babbeafb45 100644
--- a/qt/slider_ctrl.hpp
+++ b/qt/slider_ctrl.hpp
@@ -1,6 +1,11 @@
#pragma once
-#include <QtWidgets/QSlider>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QSlider>
+#else
+ #include <QtWidgets/QSlider>
+#endif
namespace qt
{
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index d952fa897c..627a03490b 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -9,15 +9,25 @@
#include <QtCore/QDateTime>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QTreeWidget>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QProgressBar>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QVBoxLayout>
+ #include <QtGui/QHBoxLayout>
+ #include <QtGui/QLabel>
+ #include <QtGui/QPushButton>
+ #include <QtGui/QTreeWidget>
+ #include <QtGui/QHeaderView>
+ #include <QtGui/QMessageBox>
+ #include <QtGui/QProgressBar>
+#else
+ #include <QtWidgets/QVBoxLayout>
+ #include <QtWidgets/QHBoxLayout>
+ #include <QtWidgets/QLabel>
+ #include <QtWidgets/QPushButton>
+ #include <QtWidgets/QTreeWidget>
+ #include <QtWidgets/QHeaderView>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QProgressBar>
+#endif
#define CHECK_FOR_UPDATE "Check for update"
#define LAST_UPDATE_CHECK "Last update check: "
@@ -346,8 +356,13 @@ namespace qt
m_tree->sortByColumn(KColumnIndexCountry, Qt::AscendingOrder);
m_tree->setSortingEnabled(true);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ m_tree->header()->setResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
+ m_tree->header()->setResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
+#else
m_tree->header()->setSectionResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
m_tree->header()->setSectionResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
+#endif
}
void UpdateDialog::OnCountryChanged(TIndex const & index)
diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp
index 4b4f74e875..1a92d2b49d 100644
--- a/qt/update_dialog.hpp
+++ b/qt/update_dialog.hpp
@@ -1,7 +1,12 @@
#pragma once
#include "../map/framework.hpp"
-#include <QtWidgets/QDialog>
+#include <Qt>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QDialog>
+#else
+ #include <QtWidgets/QDialog>
+#endif
class QTreeWidget;
class QTreeWidgetItem;
diff --git a/qt_tstfrm/gl_test_widget.hpp b/qt_tstfrm/gl_test_widget.hpp
index fc9ca7e89b..4f1cad4a9c 100644
--- a/qt_tstfrm/gl_test_widget.hpp
+++ b/qt_tstfrm/gl_test_widget.hpp
@@ -6,8 +6,11 @@
#include "../../map/qgl_render_context.hpp"
-#include <QtWidgets/QApplication>
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+ #include <QtGui/QApplication>
+#else
+ #include <QtWidgets/QApplication>
+#endif
template<class T, bool (T::*)(QKeyEvent *)>
struct key_event_fn_bind
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 16:02:30 +0300