diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-20 23:31:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-20 23:31:19 (GMT) |
| commit | 1ba1c20a38442d91bcba2761d6d90d6077b7b361 (patch) | |
| tree | a14327b336f9be73dcfbefc715e119687164e93d /src/gui/kernel/qapplication_mac.mm | |
| parent | 28cb38886d9b51e374fec71f9a2c5da6ee437e1f (diff) | |
| parent | 6a0d575270581e353af2a214451f6b41dd601f6e (diff) | |
| download | Qt-1ba1c20a38442d91bcba2761d6d90d6077b7b361.zip Qt-1ba1c20a38442d91bcba2761d6d90d6077b7b361.tar.gz Qt-1ba1c20a38442d91bcba2761d6d90d6077b7b361.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (82 commits)
Doc: Fixed spelling errors that were blocking the CI system.
Added missing license headers.
Added missing license headers.
Doc: Added missing license headers for documentation and examples.
qdoc: Fixed code to match comments in QML files. Fixed API types.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Speculative attempt to fix build breakage.
Doc: Fixed file name of a header file to use lower case characters.
Doc: Fixed links.
Doc: Added a snippet to show how to test the Qt version.
Added an additional check to workaround an issue on Windows.
Doc: Fixed a scope test for maemo5 and made an error a warning instead.
converted to unix txt file
try to resolve CRLR problems
"TAB character in non-leading whitespace" fixed
* fixed trailing- and whitespaces
* "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added
Undo accidental breakage.
Doc: Added some more information about visited links in rich text.
...
Diffstat (limited to 'src/gui/kernel/qapplication_mac.mm')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 0b9cad8..343b68f 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -2624,8 +2624,6 @@ OSStatus QApplicationPrivate::globalAppleEventProcessor(const AppleEvent *ae, Ap Return true if you want to stop the event from being processed. Return false for normal event dispatching. The default implementation returns false. - - \sa macEventFilter(void *nsevent) */ bool QApplication::macEventFilter(EventHandlerCallRef, EventRef) { |