diff options
| author | Danny Boelens <dannyb@enfocus.com> | 2013-04-17 12:30:13 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-19 05:59:42 (GMT) |
| commit | b82b8bfa811adcf11cb8d07d662fd2b9642deebc (patch) | |
| tree | 9f4831e8a4d5adabc0fcc4d7de5910fa86f571f6 /src/gui/kernel | |
| parent | 6c7b0b19da9bebbccf846f694eb6bf7891e5e883 (diff) | |
| download | Qt-b82b8bfa811adcf11cb8d07d662fd2b9642deebc.zip Qt-b82b8bfa811adcf11cb8d07d662fd2b9642deebc.tar.gz Qt-b82b8bfa811adcf11cb8d07d662fd2b9642deebc.tar.bz2 | |
Fix clang build on Mac OS X
Clang doesn't like the extra qualification in the forward declaration. Let's
move the forward declaration outside of the Qt namespace, which is better anyway
since TabletProximityRec is defined in the Apple headers/global namespace.
Task-number: QTBUG-29373
Change-Id: Iba59e6592ccbbcc09e91e1b9831a0ee588469b23
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index ba65189..5786f92 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -110,6 +110,7 @@ #include "private/qt_mac_p.h" struct HIContentBorderMetrics; +struct TabletProximityRec; #ifdef Q_WS_MAC32 typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa. @@ -155,7 +156,6 @@ bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEve void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent); bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event); inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); } -struct ::TabletProximityRec; void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); |