Use QRect::united(), QRect::unite() is deprecated.
authorSergio Martins <iamsergio@gmail.com>
Thu, 8 Mar 2012 20:41:12 +0000 (20:41 +0000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 10:37:18 +0000 (11:37 +0100)
Change-Id: Ia7aac74596c2f251c96fecf157d2aa4a935cf602
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
examples/draganddrop/puzzle/puzzlewidget.cpp
examples/itemviews/puzzle/puzzlewidget.cpp

index 1c5b0cc..2e39f84 100644 (file)
@@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
 
 void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+    QRect updateRect = highlightedRect.united(targetSquare(event->pos()));
 
     if (event->mimeData()->hasFormat("image/x-puzzle-piece")
         && findPiece(targetSquare(event->pos())) == -1) {
index a622050..96d8c60 100644 (file)
@@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
 
 void PuzzleWidget::dragMoveEvent(QDragMoveEvent *event)
 {
-    QRect updateRect = highlightedRect.unite(targetSquare(event->pos()));
+    QRect updateRect = highlightedRect.united(targetSquare(event->pos()));
 
     if (event->mimeData()->hasFormat("image/x-puzzle-piece")
         && findPiece(targetSquare(event->pos())) == -1) {