From b82b8bfa811adcf11cb8d07d662fd2b9642deebc Mon Sep 17 00:00:00 2001 From: Danny Boelens Date: Wed, 17 Apr 2013 14:30:13 +0200 Subject: Fix clang build on Mac OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gui/kernel/qt_cocoa_helpers_mac_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(QCoreApplication::instance()); } -struct ::TabletProximityRec; void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); -- cgit v0.12