Fix composer map frame/annotations not showing on OSX (refs #12747)

qgis · May 28, 2015 · effbfcd · effbfcd
1 parent 5386a23
commit effbfcd
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -667,7 +667,14 @@ void QgsComposerMapGrid::draw( QPainter* p )
   }
 
   p->restore();
+
+  //QPainter::setClipping(false) seems to be broken on OSX (#12747), setClipRect
+  //fails on other platforms...
+#ifndef Q_OS_MAC
   p->setClipping( false );
+#else
+  p->setClipRect( thisPaintRect, Qt::NoClip );
+#endif
 
   if ( mGridFrameStyle != QgsComposerMapGrid::NoFrame )
   {