diff options
| author | Nick Shaforostoff <shaforostoff@gmail.com> | 2016-04-13 00:47:50 +0300 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-08-26 07:39:53 +0000 |
| commit | 8adad2fe09b173ff876895c27884f49804a20bcc (patch) | |
| tree | 97cc19e256e08e8c958cb1b60860e153a8f18685 /src/plugins/platforms/ios/qiosintegration.mm | |
| parent | 15c39dfe3db5c4264b49cb53e80ec088ea4948e9 (diff) | |
fix build with various QT_NO_* defines
Done-with: Andriy Gerasika <andriy.gerasika@gmail.com>
Change-Id: I90883a491dbddb005c3d756c339e42285d50e437
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qiosintegration.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 297b549ec2..94dd643116 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -74,7 +74,7 @@ QIOSIntegration *QIOSIntegration::instance() QIOSIntegration::QIOSIntegration() : m_fontDatabase(new QCoreTextFontDatabase) -#ifndef Q_OS_TVOS +#if !defined(Q_OS_TVOS) && !defined(QT_NO_CLIPBOARD) , m_clipboard(new QIOSClipboard) #endif , m_inputContext(0) @@ -131,7 +131,7 @@ QIOSIntegration::~QIOSIntegration() delete m_fontDatabase; m_fontDatabase = 0; -#ifndef Q_OS_TVOS +#if !defined(Q_OS_TVOS) && !defined(QT_NO_CLIPBOARD) delete m_clipboard; m_clipboard = 0; #endif @@ -221,6 +221,7 @@ QPlatformFontDatabase * QIOSIntegration::fontDatabase() const return m_fontDatabase; } +#ifndef QT_NO_CLIPBOARD QPlatformClipboard *QIOSIntegration::clipboard() const { #ifndef Q_OS_TVOS @@ -229,6 +230,7 @@ QPlatformClipboard *QIOSIntegration::clipboard() const return 0; #endif } +#endif QPlatformInputContext *QIOSIntegration::inputContext() const { @@ -276,12 +278,14 @@ QTouchDevice *QIOSIntegration::touchDevice() return m_touchDevice; } +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *QIOSIntegration::accessibility() const { if (!m_accessibility) m_accessibility = new QIOSPlatformAccessibility; return m_accessibility; } +#endif QPlatformNativeInterface *QIOSIntegration::nativeInterface() const { |