Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 4 insertions, 3 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index 799f23b14a..313825d0a7 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -66,8 +66,8 @@ class Q_CORE_EXPORT QEventDispatcherGlib : public QAbstractEventDispatcher
     Q_DECLARE_PRIVATE(QEventDispatcherGlib)
 
 public:
-    explicit QEventDispatcherGlib(QObject *parent = 0);
-    explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0);
+    explicit QEventDispatcherGlib(QObject *parent = nullptr);
+    explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = nullptr);
     ~QEventDispatcherGlib();
 
     bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
@@ -102,12 +102,13 @@ class Q_CORE_EXPORT QEventDispatcherGlibPrivate : public QAbstractEventDispatche
 {
 
 public:
-    QEventDispatcherGlibPrivate(GMainContext *context = 0);
+    QEventDispatcherGlibPrivate(GMainContext *context = nullptr);
     GMainContext *mainContext;
     GPostEventSource *postEventSource;
     GSocketNotifierSource *socketNotifierSource;
     GTimerSource *timerSource;
     GIdleTimerSource *idleTimerSource;
+    bool wakeUpCalled = true;
 
     void runTimersOnceWithNormalPriority();
 };