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

Remove usage of deprecated QRect::unite

Browse Source 
Change-Id: I1920da995fde6ff2a8b2e3facddeee6e3c17b44c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Olivier Goffart 2012-02-26 11:00:44 +01:00 committed by Qt by Nokia
parent 4f4491e0b6
commit 5cc1a87250
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/itemviews/qcolumnview.cpp
View File

@ -481,7 +481,7 @@ QRegion QColumnView::visualRegionForSelection(const QItemSelection &selection) c
QRegion firstRegion = visualRect(firstIdx);
QRegion lastRegion = visualRect(lastIdx);
return firstRegion.unite(lastRegion);
return firstRegion.united(lastRegion);
}
/*!

2
src/widgets/widgets/qworkspace.cpp
View File

@ -3204,7 +3204,7 @@ QRect QWorkspacePrivate::updateWorkspace()
QWorkspaceChild *child = *it;
++it;
if (!child->isHidden())
r = r.unite(child->geometry());
r = r.united(child->geometry());
}
vbar->blockSignals(true);
hbar->blockSignals(true);