From 85b3c5d0ec2280393e1c5ac7af6a56abf9fc2e9a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 6 Dec 2012 20:22:35 -0600
Subject: [PATCH] Maintain binary compatibility when switching between glib
 event loop and standard event loop

---
 src/kernel/qeventloop.h | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/kernel/qeventloop.h b/src/kernel/qeventloop.h
index 25f80cd..a3ee01d 100644
--- a/src/kernel/qeventloop.h
+++ b/src/kernel/qeventloop.h
@@ -102,25 +102,6 @@ public:
 
     virtual void wakeUp();
 
-#ifdef Q_QDOC
-#else // Q_QDOC
-#if defined(QT_USE_GLIBMAINLOOP)
-	
-    // glib main loop support
-
-    /* internal: used to fit glib-main-loop gsource concept */
-
-    bool gsourcePrepare(GSource *gs, int * timeout);
-    bool gsourceCheck(GSource * gs);
-    bool gsourceDispatch(GSource * gs);
-
-    bool processX11Events();
-
-    // end glib main loop support
-	
-#endif //QT_USE_GLIBMAINLOOP
-#endif // Q_QDOC
-
     void setSingleToolkitEventHandling(bool enabled);
 
 signals:
@@ -145,6 +126,24 @@ private:
     QEventLoopPrivate *d;
 
     friend class QApplication;
+
+#ifdef Q_QDOC
+#else // Q_QDOC
+#if defined(QT_USE_GLIBMAINLOOP)
+
+    // glib main loop support
+    /* internal: used to fit glib-main-loop gsource concept */
+public:
+    bool gsourcePrepare(GSource *gs, int * timeout);
+    bool gsourceCheck(GSource * gs);
+    bool gsourceDispatch(GSource * gs);
+
+    bool processX11Events();
+
+    // end glib main loop support
+	
+#endif //QT_USE_GLIBMAINLOOP
+#endif // Q_QDOC
 };
 
 #endif // QEVENTLOOP_H