summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-10-15 12:00:56 +0200
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-10-20 11:42:01 +0200
commitcc1058a27882320afe006fc77a8daab3125f358e (patch)
tree1675e923f4f5d314518cc9370fe48a817047361e
parentcc73cc9a4c6a4b58f14c117e02dc12e77924b4a6 (diff)
iOS: Move UIView helpers to once place
Change-Id: I9e20d23ad813503ea5c6bef3303ebc0f6b9e99cd Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/plugins/platforms/ios/qioswindow.h5
-rw-r--r--src/plugins/platforms/ios/quiview.h4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 5bbd76fb36..f7c8f35621 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -42,11 +42,6 @@
class QIOSContext;
class QIOSWindow;
-@interface UIView (QIOS)
-@property(readonly) QWindow *qwindow;
-@property(readonly) UIViewController *viewController;
-@end
-
QT_BEGIN_NAMESPACE
@class QUIView;
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h
index fe71e5bed7..6550c61ad0 100644
--- a/src/plugins/platforms/ios/quiview.h
+++ b/src/plugins/platforms/ios/quiview.h
@@ -62,7 +62,9 @@ class QIOSWindow;
- (void)clearAccessibleCache;
@end
-@interface QUIView (QtHelpers)
+@interface UIView (QtHelpers)
+- (QWindow *)qwindow;
+- (UIViewController *)viewController;
- (QIOSViewController*)qtViewController;
@end