summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2012-11-30 10:09:34 +0100
committerLars Knoll <lars.knoll@digia.com>2012-11-30 10:10:36 +0100
commit560dce8eb6986178361e3d8bf9fa55071b1d72b4 (patch)
treed0d8184c5514e894326110e5778b0b79ca12b650 /Source/WebKit2/UIProcess
parent4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (diff)
downloadqtwebkit-560dce8eb6986178361e3d8bf9fa55071b1d72b4.tar.gz
Fix compilation
QWindow::pos() is not called position() Change-Id: I0c3703b39bdf22918aba0a309ca8805e4036dfd8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess')
-rw-r--r--Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp b/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
index 1cf3ae568..b8ccd977b 100644
--- a/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
@@ -88,7 +88,7 @@ void PageViewportControllerClientQt::setContentRectVisiblePositionAtScale(const
// To animate the position together with the scale we multiply the position with the current scale
// and add it to the page position (displacement on the flickable contentItem because of additional items).
- QPointF newPosition(m_pageItem->pos() + location * itemScale);
+ QPointF newPosition(m_pageItem->position() + location * itemScale);
m_viewportItem->setContentPos(newPosition);
}
@@ -317,7 +317,7 @@ QRectF PageViewportControllerClientQt::nearestValidVisibleContentsRect() const
void PageViewportControllerClientQt::setViewportPosition(const FloatPoint& contentsPoint)
{
- QPointF newPosition((m_pageItem->pos() + QPointF(contentsPoint)) * m_pageItem->contentsScale());
+ QPointF newPosition((m_pageItem->position() + QPointF(contentsPoint)) * m_pageItem->contentsScale());
m_viewportItem->setContentPos(newPosition);
updateViewportController();
}