diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-23 16:48:35 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-23 16:48:35 (GMT) |
| commit | bbc2099ea172ea65294bd91554145786c2a4a9e1 (patch) | |
| tree | aa9c739c87775ff76b37ca839d987dc43a110b80 /src/gui/util | |
| parent | 6566f5e341c18912f7f1a9fbf4727e0ac92a1a9f (diff) | |
| parent | 05402ac27bd669c371e4ba08763ba45d6b31edc4 (diff) | |
| download | Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.zip Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.tar.gz Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index 5cadbbd..348657e 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -93,6 +93,7 @@ extern bool qt_mac_execute_apple_script(const QString &script, AEDesc *ret); //q extern void qtsystray_sendActivated(QSystemTrayIcon *i, int r); //qsystemtrayicon.cpp extern NSString *keySequenceToKeyEqivalent(const QKeySequence &accel); // qmenu_mac.mm extern NSUInteger keySequenceModifierMask(const QKeySequence &accel); // qmenu_mac.mm +extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); QT_END_NAMESPACE QT_USE_NAMESPACE @@ -382,7 +383,6 @@ QT_END_NAMESPACE [self menuTrackingDone:nil]; } -extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); - (void)otherMouseDown:(NSEvent *)mouseEvent { [self mousePressed:mouseEvent button:cocoaButton2QtButton([mouseEvent buttonNumber])]; |