--- a/src/gui/kernel/qeventdispatcher_mac_p.h	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/gui/kernel/qeventdispatcher_mac_p.h	Thu Jul 22 16:41:55 2010 +0100
@@ -100,6 +100,7 @@
 typedef struct _QCocoaModalSessionInfo {
     QPointer<QWidget> widget;
     NSModalSession session;
+    void *nswindow;
 } QCocoaModalSessionInfo;
 #endif
 
@@ -174,13 +175,16 @@
     static QStack<QCocoaModalSessionInfo> cocoaModalSessionStack;
     static bool currentExecIsNSAppRun;
     static bool nsAppRunCalledByQt;
+    static bool cleanupModalSessionsNeeded;
     static NSModalSession currentModalSessionCached;
+    static NSModalSession currentModalSession();
     static void updateChildrenWorksWhenModal();
-    static NSModalSession currentModalSession();
-    static int activeModalSessionCount();
     static void temporarilyStopAllModalSessions();
     static void beginModalSession(QWidget *widget);
     static void endModalSession(QWidget *widget);
+    static void cancelWaitForMoreEvents();
+    static void cleanupModalSessions();
+    static void ensureNSAppInitialized();
 #endif
 
     MacSocketHash macSockets;
@@ -190,7 +194,7 @@
     CFRunLoopObserverRef firstTimeObserver;
     QAtomicInt serialNumber;
     int lastSerial;
-    bool interrupt;
+    static bool interrupt;
 private:
     static Boolean postedEventSourceEqualCallback(const void *info1, const void *info2);
     static void postedEventsSourcePerformCallback(void *info);
@@ -211,6 +215,7 @@
 
     public:
     static void interruptLater();
+    static void cancelInterruptLater();
 };
 #endif