summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-07 17:40:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-07 17:40:19 (GMT)
commit161f15e1e79ec5f23244da68340ba1e78f3ac4bb (patch)
tree49bad920fe77a6d2f6035e7a0dc65c03ef72faed /src/gui
parentea6ce3eb29ce41e017d71699b08d10c3eca76b52 (diff)
parentd0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a (diff)
downloadQt-161f15e1e79ec5f23244da68340ba1e78f3ac4bb.zip
Qt-161f15e1e79ec5f23244da68340ba1e78f3ac4bb.tar.gz
Qt-161f15e1e79ec5f23244da68340ba1e78f3ac4bb.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the icd auto config test after restructuring the icd plugin dependencies Ensure that actions are still fired even if there is no visible window
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qcocoaapplicationdelegate_mac.mm5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 7a9dc70..9b07d64 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -320,5 +320,10 @@ static void cleanupCocoaApplicationDelegate()
[NSApp terminate:self];
}
+- (void)qtDispatcherToQAction:(id)sender
+{
+ [[NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)] qtDispatcherToQAction:sender];
+}
+
@end
#endif