diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-06-11 11:58:43 +0200 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2013-06-12 12:52:17 +0200 |
| commit | 696f60b3b3e13a244cb1ae91e836e4db6c766b21 (patch) | |
| tree | ee1fc2da7cdd29a7a00d09c85b7cf0f769264328 | |
| parent | 9fd25ba679de1d141e87046b10cd7165b2ea15e3 (diff) | |
Fix QMF with Qt 5.1+4.0.1
Q_GLOBAL_STATIC changed implementation. To make life easy, just make the
constructor public, and stop trying to use Q_GLOBAL_STATIC in a rather
unsupported way.
Change-Id: I7c6b13534c1a32db643574a9814b73ce0e0b22cf
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| -rw-r--r-- | examples/qtmail/app/statusmonitor.cpp | 1 | ||||
| -rw-r--r-- | examples/qtmail/app/statusmonitor.h | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/examples/qtmail/app/statusmonitor.cpp b/examples/qtmail/app/statusmonitor.cpp index 2f2d3106..ecfede43 100644 --- a/examples/qtmail/app/statusmonitor.cpp +++ b/examples/qtmail/app/statusmonitor.cpp @@ -48,7 +48,6 @@ #include <QResizeEvent> #include <qtmailnamespace.h> -#define DEFINE_STATUS_MONITOR_INSTANCE #include "statusmonitor.h" class ServiceActionStatusWidget : public QWidget diff --git a/examples/qtmail/app/statusmonitor.h b/examples/qtmail/app/statusmonitor.h index 400b29b2..42156da6 100644 --- a/examples/qtmail/app/statusmonitor.h +++ b/examples/qtmail/app/statusmonitor.h @@ -82,15 +82,12 @@ private: QString m_description; }; -#ifdef DEFINE_STATUS_MONITOR_INSTANCE -static StatusMonitor* StatusMonitorInstance(); -#endif - class StatusMonitor : public QObject { Q_OBJECT public: + StatusMonitor(); static StatusMonitor* instance(); void add(StatusItem* newItem); int itemCount() const; @@ -107,11 +104,7 @@ private slots: void statusItemDestroyed(QObject*); private: - StatusMonitor(); void updateProgress(); -#ifdef DEFINE_STATUS_MONITOR_INSTANCE - friend StatusMonitor* StatusMonitorInstance(); -#endif private: QList<StatusItem*> m_statusItems; |