Merge "Merge master into api_changes" into refs/staging/api_changes

1 files changed, 2 insertions, 0 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 97e7a7ffde..fb3ee3290e 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -61,6 +61,7 @@ public:
     ~QCocoaScreen();
 
     QRect geometry() const { return m_geometry; }
+    QRect availableGeometry() const { return m_availableGeometry; }
     int depth() const { return m_depth; }
     QImage::Format format() const { return m_format; }
     QSizeF physicalSize() const { return m_physicalSize; }
@@ -69,6 +70,7 @@ public:
 public:
     NSScreen *m_screen;
     QRect m_geometry;
+    QRect m_availableGeometry;
     int m_depth;
     QImage::Format m_format;
     QSizeF m_physicalSize;