From 3f29111b29d7965eba91c27f6c92a262d3b91474 Mon Sep 17 00:00:00 2001 From: Max Lapan Date: Fri, 12 Mar 2010 12:17:32 +0300 Subject: [PATCH] Wrappers for QMaemo5ValueButton to debug settings dialog standalone. --- QtMaemo5Adapters.cpp | 11 +++++++++++ QtMaemo5Adapters.hpp | 16 ++++++++++++++++ settingsDialog.cpp | 6 ++++++ settingsDialog.hpp | 5 +++++ yandex-traffic-gui.pri | 11 ++++++++++- 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 QtMaemo5Adapters.cpp create mode 100644 QtMaemo5Adapters.hpp diff --git a/QtMaemo5Adapters.cpp b/QtMaemo5Adapters.cpp new file mode 100644 index 0000000..bb2384e --- /dev/null +++ b/QtMaemo5Adapters.cpp @@ -0,0 +1,11 @@ +#include +#include "QtMaemo5Adapters.hpp" + + +// -------------------------------------------------- +// QMaemo5ValueButton +// -------------------------------------------------- +QMaemo5ValueButton::QMaemo5ValueButton (const QString& text, QWidget *parent) + : QPushButton (text, parent) +{ +} diff --git a/QtMaemo5Adapters.hpp b/QtMaemo5Adapters.hpp new file mode 100644 index 0000000..eeba684 --- /dev/null +++ b/QtMaemo5Adapters.hpp @@ -0,0 +1,16 @@ +#ifndef __QTMaemo5ADAPTERS_H__ +#define __QTMaemo5ADAPTERS_H__ + +#include + + +class QMaemo5ValueButton : public QPushButton +{ + Q_OBJECT +private: +public: + QMaemo5ValueButton (const QString& text, QWidget *parent); +}; + + +#endif // __QTMaemo5ADAPTERS_H__ diff --git a/settingsDialog.cpp b/settingsDialog.cpp index dabe604..d63a8c0 100644 --- a/settingsDialog.cpp +++ b/settingsDialog.cpp @@ -1,5 +1,11 @@ #include + +#ifdef Q_WS_MAEMO_5 #include +#else +#include "QtMaemo5Adapters.hpp" +#endif + #include "settingsDialog.hpp" diff --git a/settingsDialog.hpp b/settingsDialog.hpp index 7aab74e..cb69300 100644 --- a/settingsDialog.hpp +++ b/settingsDialog.hpp @@ -2,7 +2,12 @@ #define __SETTINGSDIALOG_H__ #include + +#ifdef Q_WS_MAEMO_5 #include +#else +#include "QtMaemo5Adapters.hpp" +#endif #include "settings.hpp" diff --git a/yandex-traffic-gui.pri b/yandex-traffic-gui.pri index 5aed1d4..72bf043 100644 --- a/yandex-traffic-gui.pri +++ b/yandex-traffic-gui.pri @@ -1,6 +1,15 @@ HEADERS += $$PWD/mainwidget.hpp $$PWD/light.hpp $$PWD/settingsDialog.hpp SOURCES += $$PWD/mainwidget.cpp $$PWD/light.cpp $$PWD/settingsDialog.cpp -QT += network xml maemo5 +!maemo5 { + HEADERS += $$PWD/QtMaemo5Adapters.hpp + SOURCES += $$PWD/QtMaemo5Adapters.cpp +} + +QT += network xml + +maemo5 { + QT += maemo5 +} INCLUDEPATH += $$PWD -- 1.7.9.5