iOS compatibility.

Change-Id: I53523294b1f2e955023a8694a3380eb8ea045692
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

4 files changed, 38 insertions, 22 deletions

diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
index cdc5fb4..f29abba 100644
--- a/src/macextras/macextras-lib.pri
+++ b/src/macextras/macextras-lib.pri
@@ -1,34 +1,37 @@
 INCLUDEPATH += $$PWD
 
-PUBLIC_HEADERS += \
-    $$PWD/qtmacfunctions.h \
-    $$PWD/qtmacnativewidget.h \
-    $$PWD/qtmaccocoaviewcontainer.h \
-    $$PWD/qtmactoolbutton.h \
-    $$PWD/qtmacunifiedtoolbar.h
-
-HEADERS += \
-    $$PWD/qtmactoolbardelegate.h \
-    $$PWD/qtnstoolbar.h
+mac {
+    PUBLIC_HEADERS += $$PWD/qtmacfunctions.h
+    OBJECTIVE_SOURCES += $$PWD/qtmacfunctions.mm
+}
 
 macx:!ios {
+    PUBLIC_HEADERS += \
+        $$PWD/qtmaccocoaviewcontainer.h \
+        $$PWD/qtmacnativewidget.h \
+        $$PWD/qtmactoolbutton.h \
+        $$PWD/qtmacunifiedtoolbar.h
+
+    PRIVATE_HEADERS += \
+        $$PWD/qtmactoolbardelegate.h \
+        $$PWD/qtnstoolbar.h
+
     OBJECTIVE_SOURCES += \
-        $$PWD/qtmacfunctions.mm \
-        $$PWD/qtmacnativewidget.mm \
         $$PWD/qtmaccocoaviewcontainer.mm \
+        $$PWD/qtmacnativewidget.mm \
         $$PWD/qtmactoolbardelegate.mm \
         $$PWD/qtmactoolbutton.mm \
         $$PWD/qtmacunifiedtoolbar.mm \
         $$PWD/qtnstoolbar.mm
 
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h
+        OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
+    }
+
     LIBS *= -framework AppKit
 } else {
     SOURCES += $$PWD/qtmacunifiedtoolbar.cpp
 }
 
-macx:!ios:greaterThan(QT_MAJOR_VERSION, 4) {
-    HEADERS += $$PWD/qmacpasteboardmime.h
-    OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
-}
-
-HEADERS += $$PUBLIC_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/macextras/qtmacfunctions.h b/src/macextras/qtmacfunctions.h
index f168a12..cf8bcb8 100644
--- a/src/macextras/qtmacfunctions.h
+++ b/src/macextras/qtmacfunctions.h
@@ -67,17 +67,21 @@ class QMenu;
 class QPixmap;
 class QString;
 
+#ifndef Q_OS_IOS
 Q_MACEXTRAS_EXPORT void qt_mac_set_dock_menu(QMenu *menu);
+#endif
 
 namespace Qt
 {
-Q_MACEXTRAS_EXPORT NSMenu* toNSMenu(QMenu *menu);
 Q_MACEXTRAS_EXPORT NSString* toNSString(const QString &string);
 Q_MACEXTRAS_EXPORT QString fromNSString(const NSString *string);
-
 Q_MACEXTRAS_EXPORT CGImageRef toMacCGImageRef(const QPixmap &pixmap);
-Q_MACEXTRAS_EXPORT NSImage* toMacNSImage(const QPixmap &pixmap);
 Q_MACEXTRAS_EXPORT QPixmap fromMacCGImageRef(CGImageRef image);
+
+#ifndef Q_OS_IOS
+Q_MACEXTRAS_EXPORT NSMenu* toNSMenu(QMenu *menu);
+Q_MACEXTRAS_EXPORT NSImage* toMacNSImage(const QPixmap &pixmap);
+#endif
 }
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qtmacfunctions.mm b/src/macextras/qtmacfunctions.mm
index 4c348ec..451e97b 100644
--- a/src/macextras/qtmacfunctions.mm
+++ b/src/macextras/qtmacfunctions.mm
@@ -40,7 +40,12 @@
 ****************************************************************************/
 
 #include "qtmacfunctions.h"
+#ifdef Q_OS_IOS
+#import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
+#else
 #import <Cocoa/Cocoa.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -62,6 +67,7 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePlatformFu
     return function;
 }
 
+#ifndef Q_OS_IOS
 void qt_mac_set_dock_menu(QMenu *menu)
 {
     // Get the platform menu, which will be a QCocoaMenu
@@ -88,6 +94,7 @@ NSMenu *toNSMenu(QMenu *menu)
     }
     return nil;
 }
+#endif
 
 #endif
 
@@ -136,6 +143,7 @@ CGImageRef toMacCGImageRef(const QPixmap &pixmap)
 #endif
 }
 
+#ifndef Q_OS_IOS
 NSImage* toMacNSImage(const QPixmap &pixmap)
 {
     NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:toMacCGImageRef(pixmap)];
@@ -144,6 +152,7 @@ NSImage* toMacNSImage(const QPixmap &pixmap)
     [bitmapRep release];
     return image;
 }
+#endif
 
 /*!
     Returns a QPixmap that is equivalent to the given \a image.
diff --git a/src/src.pro b/src/src.pro
index 89e9950..317df66 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-macx:!ios:SUBDIRS += macextras
+mac:SUBDIRS += macextras