d->roleNames[FileLastModifiedRole] = "fileModified";
d->roleNames[FileLastReadRole] = "fileAccessed";
d->roleNames[FileIsDirRole] = "fileIsDir";
- setRoleNames(d->roleNames);
-
d->init();
}
return rv;
}
+QHash<int, QByteArray> QQuickFolderListModel::roleNames() const
+{
+ Q_D(const QQuickFolderListModel);
+ return d->roleNames;
+}
+
/*!
\qmlproperty int FolderListModel::count
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]
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();
void InspectTool::mouseDoubleClickEvent(QMouseEvent *event)
{
- m_mousePosition = event->posF();
+ m_mousePosition = event->localPos();
m_pressAndHoldTimer.stop();
if (event->button() == Qt::LeftButton) {
selectNextItem();
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) {
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;
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;
{
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());
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();