AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QRect::united(), QRect::unite() is deprecated.

Browse Source 
Change-Id: Ia7aac74596c2f251c96fecf157d2aa4a935cf602
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Sergio Martins 2012-03-08 20:41:12 +00:00 committed by Qt by Nokia
parent b64426248d
commit 62dfed9a7f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/draganddrop/puzzle/puzzlewidget.cpp
View File

@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
void PuzzleWidget::dragMoveEvent(QDragMoveEvent *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") if (event->mimeData()->hasFormat("image/x-puzzle-piece")
&& findPiece(targetSquare(event->pos())) == -1) { && findPiece(targetSquare(event->pos())) == -1) {

2
examples/itemviews/puzzle/puzzlewidget.cpp
View File

@ -78,7 +78,7 @@ void PuzzleWidget::dragLeaveEvent(QDragLeaveEvent *event)
void PuzzleWidget::dragMoveEvent(QDragMoveEvent *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") if (event->mimeData()->hasFormat("image/x-puzzle-piece")
&& findPiece(targetSquare(event->pos())) == -1) { && findPiece(targetSquare(event->pos())) == -1) {