Merge branch 'master-upstream' into master-water

3 files changed, 16 insertions, 1 deletions

diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index df1210f..c051228 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -1620,7 +1620,11 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn)
         extra->staticContentsSize = data.crect.size();
     }
 
+#ifdef Q_WS_QPA //Dont even call q->p
+    QPaintEngine *engine = 0;
+#else
     QPaintEngine *engine = q->paintEngine();
+#endif
     // QGLWidget does not support partial updates if:
     // 1) The context is double buffered
     // 2) The context is single buffered and auto-fill background is enabled.
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index 601cf86..c14e558 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -57,6 +57,8 @@
 
 #include <private/qfont_p.h>
 #include <private/qfontengine_p.h>
+#include <private/qfontengine_coretext_p.h>
+#include <private/qfontengine_mac_p.h>
 #include <private/qnumeric_p.h>
 #include <private/qpainter_p.h>
 #include <private/qpainterpath_p.h>
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index e9eb9c5..3ee8281 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -74,7 +74,7 @@ public:
     \since 4.3
     \internal
     \preliminary
-    \ingroup qws
+    \ingroup qws qpa
 
     \brief The QWindowSurface class provides the drawing area for top-level
     windows.
@@ -179,11 +179,20 @@ QRect QWindowSurface::geometry() const
     return d_ptr->geometry;
 }
 #else
+
+/*!
+      Sets the size of the windowsurface to be \a size.
+
+      \sa size()
+*/
 void QWindowSurface::resize(const QSize &size)
 {
     d_ptr->size = size;
 }
 
+/*!
+    Returns the current size of the windowsurface.
+*/
 QSize QWindowSurface::size() const
 {
     return d_ptr->size;