diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:30:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:30:27 (GMT) |
commit | a7f0c36effc38a8d6525538afe1fdcd88b39d244 (patch) | |
tree | b2bf6ad19d15ed1f393b9aff81ed2ee2b77e2b01 /src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | |
parent | dbfe5f81e300de3a43311197826f23ff031b4b23 (diff) | |
parent | c072fa8fdd0cebcaff9062e07d4623bbd7aded3c (diff) | |
download | Qt-a7f0c36effc38a8d6525538afe1fdcd88b39d244.zip Qt-a7f0c36effc38a8d6525538afe1fdcd88b39d244.tar.gz Qt-a7f0c36effc38a8d6525538afe1fdcd88b39d244.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
qdoc: Removed debugging code.
Doc: Updated the configuration file for the Simplified Chinese docs.
qdoc: Standardized encoding names and updated the Chinese config files.
Doc: Added Simplified Chinese documents and build rules for them.
qdoc: Added support for different source and output character encodings.
Doc: Synchronize configuration files for easier maintenance.
Diffstat (limited to 'src/gui/kernel/qcocoasharedwindowmethods_mac_p.h')
-rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index a1d2c61..9fe5ae0 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h @@ -183,8 +183,18 @@ QT_END_NAMESPACE - (void)sendEvent:(NSEvent *)event { - QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; + if ([event type] == NSApplicationDefined) { + switch ([event subtype]) { + case QtCocoaEventSubTypePostMessage: + [NSApp qt_sendPostedMessage:event]; + return; + default: + break; + } + return; + } + QWidget *widget = [[QT_MANGLE_NAMESPACE(QCocoaWindowDelegate) sharedDelegate] qt_qwidgetForWindow:self]; // Cocoa can hold onto the window after we've disavowed its knowledge. So, // if we get sent an event afterwards just have it go through the super's // version and don't do any stuff with Qt. |