1 files changed, 5 insertions, 15 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index df080809b6..18a96c6e9a 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -86,12 +86,6 @@ public:
 
 class QEventDispatcherUNIXPrivate;
 
-#ifdef Q_OS_QNX
-#  define FINAL_EXCEPT_BLACKBERRY
-#else
-#  define FINAL_EXCEPT_BLACKBERRY Q_DECL_FINAL
-#endif
-
 class Q_CORE_EXPORT QEventDispatcherUNIX : public QAbstractEventDispatcher
 {
     Q_OBJECT
@@ -104,8 +98,8 @@ public:
     bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE;
     bool hasPendingEvents() Q_DECL_OVERRIDE;
 
-    void registerSocketNotifier(QSocketNotifier *notifier) FINAL_EXCEPT_BLACKBERRY;
-    void unregisterSocketNotifier(QSocketNotifier *notifier) FINAL_EXCEPT_BLACKBERRY;
+    void registerSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL;
+    void unregisterSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL;
 
     void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) Q_DECL_FINAL;
     bool unregisterTimer(int timerId) Q_DECL_FINAL;
@@ -114,7 +108,7 @@ public:
 
     int remainingTime(int timerId) Q_DECL_FINAL;
 
-    void wakeUp() FINAL_EXCEPT_BLACKBERRY;
+    void wakeUp() Q_DECL_FINAL;
     void interrupt() Q_DECL_FINAL;
     void flush() Q_DECL_OVERRIDE;
 
@@ -140,10 +134,8 @@ public:
     ~QEventDispatcherUNIXPrivate();
 
     int doSelect(QEventLoop::ProcessEventsFlags flags, timespec *timeout);
-    virtual int initThreadWakeUp() FINAL_EXCEPT_BLACKBERRY;
-    virtual int processThreadWakeUp(int nsel) FINAL_EXCEPT_BLACKBERRY;
-
-    bool mainThread;
+    virtual int initThreadWakeUp() Q_DECL_FINAL;
+    virtual int processThreadWakeUp(int nsel) Q_DECL_FINAL;
 
     // note for eventfd(7) support:
     // if thread_pipe[1] is -1, then eventfd(7) is in use and is stored in thread_pipe[0]
@@ -163,8 +155,6 @@ public:
     QAtomicInt interrupt; // bool
 };
 
-#undef FINAL_EXCEPT_BLACKBERRY
-
 QT_END_NAMESPACE
 
 #endif // QEVENTDISPATCHER_UNIX_P_H