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>

11 files changed, 43 insertions, 3 deletions

diff --git a/src/plugins/platforms/ios/qiosclipboard.h b/src/plugins/platforms/ios/qiosclipboard.h
index b9ba4a2669..f3ccfcace0 100644
--- a/src/plugins/platforms/ios/qiosclipboard.h
+++ b/src/plugins/platforms/ios/qiosclipboard.h
@@ -40,10 +40,13 @@
 #ifndef QIOSCLIPBOARD_H
 #define QIOSCLIPBOARD_H
 
+#include <qpa/qplatformclipboard.h>
+
+#ifndef QT_NO_CLIPBOARD
+
 #import <UIKit/UIKit.h>
 
 #include <QMimeData>
-#include <qpa/qplatformclipboard.h>
 
 @class QUIClipboard;
 
@@ -67,4 +70,6 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_CLIPBOARD
+
 #endif // QIOSCLIPBOARD_H
diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm
index fb75cc793c..960c9f39db 100644
--- a/src/plugins/platforms/ios/qiosclipboard.mm
+++ b/src/plugins/platforms/ios/qiosclipboard.mm
@@ -39,6 +39,8 @@
 
 #include "qiosclipboard.h"
 
+#ifndef QT_NO_CLIPBOARD
+
 #include <QtPlatformSupport/private/qmacmime_p.h>
 #include <QtCore/QMimeData>
 #include <QtGui/QGuiApplication>
@@ -247,3 +249,5 @@ bool QIOSClipboard::ownsMode(QClipboard::Mode mode) const
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_CLIPBOARD
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index 36c3bbf6f1..d9a43a683e 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -72,7 +72,9 @@ public:
     QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
 
     QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
+#ifndef QT_NO_CLIPBOARD
     QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
+#endif
     QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
     QPlatformServices *services() const Q_DECL_OVERRIDE;
 
@@ -85,7 +87,9 @@ public:
     QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
 
     QTouchDevice *touchDevice();
+#ifndef QT_NO_ACCESSIBILITY
     QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
+#endif
 
     // Called from Objective-C class QIOSScreenTracker, which can't be friended
     void addScreen(QPlatformScreen *screen) { screenAdded(screen); }
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
 {
diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h
index dab5720d48..b7371a5f49 100644
--- a/src/plugins/platforms/ios/qiosmenu.h
+++ b/src/plugins/platforms/ios/qiosmenu.h
@@ -68,7 +68,9 @@ public:
     void setRole(MenuRole role) Q_DECL_OVERRIDE;
     void setCheckable(bool) Q_DECL_OVERRIDE {}
     void setChecked(bool) Q_DECL_OVERRIDE {}
+#ifndef QT_NO_SHORTCUT
     void setShortcut(const QKeySequence&) Q_DECL_OVERRIDE;
+#endif
     void setEnabled(bool enabled) Q_DECL_OVERRIDE;
     void setIconSize(int) Q_DECL_OVERRIDE {}
 
diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm
index d5211cdd8a..6165e480dc 100644
--- a/src/plugins/platforms/ios/qiosmenu.mm
+++ b/src/plugins/platforms/ios/qiosmenu.mm
@@ -304,10 +304,12 @@ void QIOSMenuItem::setRole(QPlatformMenuItem::MenuRole role)
     m_role = role;
 }
 
+#ifndef QT_NO_SHORTCUT
 void QIOSMenuItem::setShortcut(const QKeySequence &sequence)
 {
     m_shortcut = sequence;
 }
+#endif
 
 void QIOSMenuItem::setEnabled(bool enabled)
 {
@@ -547,6 +549,7 @@ QIOSMenuItemList QIOSMenu::filterFirstResponderActions(const QIOSMenuItemList &m
 
     for (int i = 0; i < menuItems.count(); ++i) {
         QIOSMenuItem *menuItem = menuItems.at(i);
+#ifndef QT_NO_SHORTCUT
         QKeySequence shortcut = menuItem->m_shortcut;
         if ((shortcut == QKeySequence::Cut && [responder canPerformAction:@selector(cut:) withSender:nil])
                 || (shortcut == QKeySequence::Copy && [responder canPerformAction:@selector(copy:) withSender:nil])
@@ -560,6 +563,7 @@ QIOSMenuItemList QIOSMenu::filterFirstResponderActions(const QIOSMenuItemList &m
                 || (shortcut == QKeySequence::Underline && [responder canPerformAction:@selector(toggleUnderline:) withSender:nil])) {
             continue;
         }
+#endif
         filteredMenuItems.append(menuItem);
     }
     return filteredMenuItems;
diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.h b/src/plugins/platforms/ios/qiosplatformaccessibility.h
index 2374457591..989eaa4fb8 100644
--- a/src/plugins/platforms/ios/qiosplatformaccessibility.h
+++ b/src/plugins/platforms/ios/qiosplatformaccessibility.h
@@ -42,6 +42,8 @@
 
 #include <qpa/qplatformaccessibility.h>
 
+#ifndef QT_NO_ACCESSIBILITY
+
 QT_BEGIN_NAMESPACE
 
 class QIOSPlatformAccessibility: public QPlatformAccessibility
@@ -56,3 +58,5 @@ public:
 QT_END_NAMESPACE
 
 #endif
+
+#endif
diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.mm b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
index 2ebe23c939..bc51850760 100644
--- a/src/plugins/platforms/ios/qiosplatformaccessibility.mm
+++ b/src/plugins/platforms/ios/qiosplatformaccessibility.mm
@@ -39,6 +39,8 @@
 
 #include "qiosplatformaccessibility.h"
 
+#ifndef QT_NO_ACCESSIBILITY
+
 #include <QtGui/QtGui>
 #include "qioswindow.h"
 
@@ -85,3 +87,5 @@ void QIOSPlatformAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *even
         break;
     }
 }
+
+#endif
diff --git a/src/plugins/platforms/ios/quiaccessibilityelement.h b/src/plugins/platforms/ios/quiaccessibilityelement.h
index 1a9ae2a1a7..03abf5407e 100644
--- a/src/plugins/platforms/ios/quiaccessibilityelement.h
+++ b/src/plugins/platforms/ios/quiaccessibilityelement.h
@@ -43,6 +43,8 @@
 #import <UIKit/UIKit.h>
 #import <QtGui/QtGui>
 
+#ifndef QT_NO_ACCESSIBILITY
+
 @interface QMacAccessibilityElement : UIAccessibilityElement
 {}
 
@@ -54,3 +56,4 @@
 @end
 
 #endif
+#endif
diff --git a/src/plugins/platforms/ios/quiaccessibilityelement.mm b/src/plugins/platforms/ios/quiaccessibilityelement.mm
index 39a879fc23..105d7cd65f 100644
--- a/src/plugins/platforms/ios/quiaccessibilityelement.mm
+++ b/src/plugins/platforms/ios/quiaccessibilityelement.mm
@@ -39,6 +39,8 @@
 
 #include "quiaccessibilityelement.h"
 
+#ifndef QT_NO_ACCESSIBILITY
+
 #include "private/qaccessiblecache_p.h"
 
 @implementation QMacAccessibilityElement
@@ -221,3 +223,5 @@
 }
 
 @end
+
+#endif
diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm
index 9f910dfe5e..2c32e56525 100644
--- a/src/plugins/platforms/ios/quiview.mm
+++ b/src/plugins/platforms/ios/quiview.mm
@@ -551,5 +551,7 @@
 
 @end
 
+#ifndef QT_NO_ACCESSIBILITY
 // Include category as an alternative to using -ObjC (Apple QA1490)
 #include "quiview_accessibility.mm"
+#endif