diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /examples/itemviews/puzzle/puzzlewidget.cpp | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'examples/itemviews/puzzle/puzzlewidget.cpp')
| -rw-r--r-- | examples/itemviews/puzzle/puzzlewidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/itemviews/puzzle/puzzlewidget.cpp b/examples/itemviews/puzzle/puzzlewidget.cpp index a622050fd3..96d8c6068f 100644 --- a/examples/itemviews/puzzle/puzzlewidget.cpp +++ b/examples/itemviews/puzzle/puzzlewidget.cpp @@ -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) { |