Skip to content

Commit 1dc8dd5

Browse files
committedMay 3, 2014
Use QRect::united instead of unite
The unite() method has been deprecated in favor of united(). In Qt 4, united() just calls unite(); in Qt 5, it is completely removed.
1 parent 0c52039 commit 1dc8dd5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎src/core/composer/qgscomposerarrow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void QgsComposerArrow::setSceneRect( const QRectF& rectangle )
113113
double margin = computeMarkerMargin();
114114

115115
// Ensure the rectangle is at least as large as needed to include the markers
116-
QRectF rect = rectangle.unite( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );
116+
QRectF rect = rectangle.united( QRectF( rectangle.x(), rectangle.y(), 2. * margin, 2. * margin ) );
117117

118118
// Compute new start and stop positions
119119
double x[2] = {rect.x(), rect.x() + rect.width()};

0 commit comments

Comments
 (0)
Please sign in to comment.