Merge pull request #1334 from simonsonc/qrect-united

Use QRect::united instead of unite
qgis · May 3, 2014 · b0e4223 · b0e4223
2 parents a096cf4 + 1dc8dd5
commit b0e4223
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp
@@ -113,7 +113,7 @@ void QgsComposerArrow::setSceneRect( const QRectF& rectangle )
   double margin = computeMarkerMargin();
 
   // Ensure the rectangle is at least as large as needed to include the markers
-  QRectF rect = rectangle.unite( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );
+  QRectF rect = rectangle.united( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );
 
   // Compute new start and stop positions
   double x[2] = {rect.x(), rect.x() + rect.width()};