Changeset 428 for trunk/src/corelib/kernel

Timestamp:

Dec 16, 2009, 1:52:19 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QSessionManager and removed the QT_NO_SESSIONMANAGER define (closes #100).

Location:

trunk/src/corelib/kernel

Files:

• qcoreapplication.h (modified) (1 diff)
• qcoreapplication_p.h (modified) (1 diff)
• qeventdispatcher_pm.cpp (modified) (1 diff)

trunk/src/corelib/kernel/qcoreapplication.h

@@ -207 +207 @@
 
     friend class QEventDispatcherUNIXPrivate;
+
     friend class QApplication;
     friend class QApplicationPrivate;

trunk/src/corelib/kernel/qcoreapplication_p.h

@@ -82 +82 @@
     static void removePostedTimerEvent(QObject *object, int timerId);
 #endif
+
+
+
 
 #ifdef Q_OS_MAC

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -1253 +1253 @@
             if (haveMessage) {
                 if (msg.msg == WM_QUIT) {
-                    if (QCoreApplication::instance())
-                        QCoreApplication::instance()->quit();
+                    if (QCoreApplication::instance()) {
+                        if (QCoreApplication::instance()->d_func()->canQuit()) {
+                            QCoreApplication::instance()->quit();
+                            return true;
+                        } else {
+                            WinCancelShutdown(d->hmq, FALSE);
+                            return true;
+                        }
+                    }
                     return false;
                 }