6 files changed, 17 insertions, 12 deletions

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 0aabb7ae74..b937fbdbc3 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -274,8 +274,6 @@ QQuickFolderListModel::QQuickFolderListModel(QObject *parent)
     d->roleNames[FileLastModifiedRole] = "fileModified";
     d->roleNames[FileLastReadRole] = "fileAccessed";
     d->roleNames[FileIsDirRole] = "fileIsDir";
-    setRoleNames(d->roleNames);
-
     d->init();
 }
 
@@ -323,6 +321,12 @@ QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const
     return rv;
 }
 
+QHash<int, QByteArray> QQuickFolderListModel::roleNames() const
+{
+    Q_D(const QQuickFolderListModel);
+    return d->roleNames;
+}
+
 /*!
     \qmlproperty int FolderListModel::count
 
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 830a30b146..d00283685b 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -97,6 +97,7 @@ public:
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
     virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    virtual QHash<int, QByteArray> roleNames() const;
 //![abslistmodel]
 
 //![count]
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index 47b1519d9a..7a17736e7e 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -120,16 +120,16 @@ void InspectTool::leaveEvent(QEvent *)
 
 void InspectTool::mousePressEvent(QMouseEvent *event)
 {
-    m_mousePosition = event->posF();
+    m_mousePosition = event->localPos();
     if (event->button() == Qt::LeftButton) {
         m_pressAndHoldTimer.start();
-        initializeDrag(event->posF());
+        initializeDrag(event->localPos());
     }
 }
 
 void InspectTool::mouseReleaseEvent(QMouseEvent *event)
 {
-    m_mousePosition = event->posF();
+    m_mousePosition = event->localPos();
     m_pressAndHoldTimer.stop();
     if (event->button() == Qt::LeftButton && !m_dragStarted) {
         selectItem();
@@ -139,7 +139,7 @@ void InspectTool::mouseReleaseEvent(QMouseEvent *event)
 
 void InspectTool::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    m_mousePosition = event->posF();
+    m_mousePosition = event->localPos();
     m_pressAndHoldTimer.stop();
     if (event->button() == Qt::LeftButton) {
         selectNextItem();
@@ -149,13 +149,13 @@ void InspectTool::mouseDoubleClickEvent(QMouseEvent *event)
 
 void InspectTool::mouseMoveEvent(QMouseEvent *event)
 {
-    m_mousePosition = event->posF();
+    m_mousePosition = event->localPos();
     moveItem(event->buttons() & Qt::LeftButton);
 }
 
 void InspectTool::hoverMoveEvent(QMouseEvent *event)
 {
-    m_mousePosition = event->posF();
+    m_mousePosition = event->localPos();
     m_pressAndHoldTimer.stop();
     QQuickItem *item = inspector()->topVisibleItemAt(event->pos());
     if (!item || item == m_lastClickedItem) {
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index fdc44c22be..4086caee8d 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -439,7 +439,7 @@ void QQmlEasingValueType::setBezierCurve(const QVariantList &customCurveVariant)
 QVariantList QQmlEasingValueType::bezierCurve() const
 {
     QVariantList rv;
-    QList<QPointF> points = v.cubicBezierSpline();
+    QVector<QPointF> points = v.toCubicSpline();
     for (int ii = 0; ii < points.count(); ++ii)
         rv << QVariant(points.at(ii).x()) << QVariant(points.at(ii).y());
     return rv;
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
index bdf147151e..1beee8c7d1 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
@@ -520,7 +520,7 @@ QImage QQuickContext2DFBOTexture::toImage(const QRectF& region)
 void QQuickContext2DFBOTexture::compositeTile(QQuickContext2DTile* tile)
 {
     QQuickContext2DFBOTile* t = static_cast<QQuickContext2DFBOTile*>(tile);
-    QRect target = t->rect().intersect(m_canvasWindow);
+    QRect target = t->rect().intersected(m_canvasWindow);
     if (target.isValid()) {
         QRect source = target;
 
@@ -730,7 +730,7 @@ void QQuickContext2DImageTexture::compositeTile(QQuickContext2DTile* tile)
 {
     Q_ASSERT(!tile->dirty());
     QQuickContext2DImageTile* t = static_cast<QQuickContext2DImageTile*>(tile);
-    QRect target = t->rect().intersect(m_canvasWindow);
+    QRect target = t->rect().intersected(m_canvasWindow);
     if (target.isValid()) {
         QRect source = target;
         source.moveTo(source.topLeft() - t->rect().topLeft());
diff --git a/tools/easingcurveeditor/splineeditor.cpp b/tools/easingcurveeditor/splineeditor.cpp
index dbd32dd63a..d4408521a8 100644
--- a/tools/easingcurveeditor/splineeditor.cpp
+++ b/tools/easingcurveeditor/splineeditor.cpp
@@ -659,7 +659,7 @@ void SplineEditor::setEasingCurve(const QEasingCurve &easingCurve)
         return;
     m_block = true;
     m_easingCurve = easingCurve;
-    m_controlPoints = m_easingCurve.cubicBezierSpline().toVector();
+    m_controlPoints = m_easingCurve.toCubicSpline();
     m_numberOfSegments = m_controlPoints.count() / 3;
     update();
     emit easingCurveChanged();