summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2012-11-30 10:09:34 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-30 17:03:18 +0100
commit3c213ae3647b0aeec05430726dc0cf35fb3b40e5 (patch)
tree54a63693f8b551458510b88dab933a2bc7330af6
parent32ea33253afbbdefd2680aa95ab5f57455272ae7 (diff)
downloadqtwebkit-3c213ae3647b0aeec05430726dc0cf35fb3b40e5.tar.gz
Fix compilation
QWindow::pos() is not called position() Change-Id: Id55c0411dc9c46560440c6682040cf76353747ed Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-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();
}