AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile cocoa with QT_NO_ACCESSIBILITY

Browse Source 
Change-Id: I82b5dbf1bce94bd928eee207992c0036edc527ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Jan Arve Saether 2012-11-01 15:07:16 +01:00 committed by The Qt Project
parent 39964b94c9
commit 5b19228c2a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaintegration.h
View File

@ -128,7 +128,9 @@ private:
QAbstractEventDispatcher *mEventDispatcher; QAbstractEventDispatcher *mEventDispatcher;
QScopedPointer<QPlatformInputContext> mInputContext; QScopedPointer<QPlatformInputContext> mInputContext;
#ifndef QT_NO_ACCESSIBILITY
QScopedPointer<QPlatformAccessibility> mAccessibility; QScopedPointer<QPlatformAccessibility> mAccessibility;
#endif
QScopedPointer<QPlatformTheme> mPlatformTheme; QScopedPointer<QPlatformTheme> mPlatformTheme;
QList<QCocoaScreen *> mScreens; QList<QCocoaScreen *> mScreens;
QCocoaClipboard *mCocoaClipboard; QCocoaClipboard *mCocoaClipboard;

6
src/plugins/platforms/cocoa/qcocoaintegration.mm
View File

@ -180,7 +180,9 @@ QCocoaIntegration::QCocoaIntegration()
: mFontDb(new QCoreTextFontDatabase()) : mFontDb(new QCoreTextFontDatabase())
, mEventDispatcher(new QCocoaEventDispatcher()) , mEventDispatcher(new QCocoaEventDispatcher())
, mInputContext(new QCocoaInputContext) , mInputContext(new QCocoaInputContext)
#ifndef QT_NO_ACCESSIBILITY
, mAccessibility(new QPlatformAccessibility) , mAccessibility(new QPlatformAccessibility)
#endif
, mCocoaClipboard(new QCocoaClipboard) , mCocoaClipboard(new QCocoaClipboard)
, mCocoaDrag(new QCocoaDrag) , mCocoaDrag(new QCocoaDrag)
, mNativeInterface(new QCocoaNativeInterface) , mNativeInterface(new QCocoaNativeInterface)
@ -352,7 +354,11 @@ QPlatformInputContext *QCocoaIntegration::inputContext() const
QPlatformAccessibility *QCocoaIntegration::accessibility() const QPlatformAccessibility *QCocoaIntegration::accessibility() const
{ {
#ifndef QT_NO_ACCESSIBILITY
return mAccessibility.data(); return mAccessibility.data();
#else
return 0;
#endif
} }
QPlatformClipboard *QCocoaIntegration::clipboard() const QPlatformClipboard *QCocoaIntegration::clipboard() const