Changeset 169 for trunk/src/gui/kernel/qapplication_pm.cpp

Timestamp:

Sep 8, 2009, 5:29:13 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed the build after disabling the qt3support module: some components still used deprecated Qt3 methods internally.

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1397 +1397 @@
     } else {
         if (type == QEvent::MouseButtonPress && !isActiveWindow())
-            setActiveWindow();
+            eWindow();
 
         gpos = qmsg.ptl;
@@ -1480 +1480 @@
 #ifndef QT_NO_CONTEXTMENU
             if (type == QEvent::ContextMenu) {
-                QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos, state);
+                QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos,
+                                    Qt::KeyboardModifiers(state & Qt::KeyboardModifierMask));
                 res = QApplication::sendSpontaneousEvent(target, &e);
                 res = res && e.isAccepted();
@@ -1550 +1551 @@
 #ifndef QT_NO_CONTEXTMENU
         if (type == QEvent::ContextMenu) {
-            QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos, state);
+            QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos,
+                                Qt::KeyboardModifiers(state & Qt::KeyboardModifierMask));
             res = QApplication::sendSpontaneousEvent(widget, &e);
             res = res && e.isAccepted();