Commit 1bd24e5b authored by Marc Mutz's avatar Marc Mutz
Browse files

QtGui: Mark some more types as shared for Qt 6.


Marking them shared (which implies movable) now
would make QLists of these BiC.

Change-Id: If5638e8d9f43e0ad549aedf08934de31e1e189f1
Reviewed-by: default avatarLars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: default avatarJędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Showing with 9 additions and 2 deletions
...@@ -87,9 +87,12 @@ public: ...@@ -87,9 +87,12 @@ public:
QCursor &operator=(const QCursor &cursor); QCursor &operator=(const QCursor &cursor);
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS
QCursor(QCursor &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; } QCursor(QCursor &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
inline QCursor &operator=(QCursor &&other) inline QCursor &operator=(QCursor &&other) Q_DECL_NOTHROW
{ qSwap(d, other.d); return *this; } { swap(other); return *this; }
#endif #endif
void swap(QCursor &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
operator QVariant() const; operator QVariant() const;
Qt::CursorShape shape() const; Qt::CursorShape shape() const;
...@@ -110,6 +113,7 @@ public: ...@@ -110,6 +113,7 @@ public:
private: private:
QCursorData *d; QCursorData *d;
}; };
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QCursor)
/***************************************************************************** /*****************************************************************************
QCursor stream functions QCursor stream functions
......
...@@ -230,6 +230,7 @@ private: ...@@ -230,6 +230,7 @@ private:
#endif #endif
}; };
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPainterPath)
Q_DECLARE_TYPEINFO(QPainterPath::Element, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(QPainterPath::Element, Q_PRIMITIVE_TYPE);
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
......
...@@ -98,6 +98,7 @@ public: ...@@ -98,6 +98,7 @@ public:
QPolygon intersected(const QPolygon &r) const Q_REQUIRED_RESULT; QPolygon intersected(const QPolygon &r) const Q_REQUIRED_RESULT;
QPolygon subtracted(const QPolygon &r) const Q_REQUIRED_RESULT; QPolygon subtracted(const QPolygon &r) const Q_REQUIRED_RESULT;
}; };
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygon)
inline QPolygon::QPolygon(int asize) : QVector<QPoint>(asize) {} inline QPolygon::QPolygon(int asize) : QVector<QPoint>(asize) {}
...@@ -174,6 +175,7 @@ public: ...@@ -174,6 +175,7 @@ public:
QPolygonF intersected(const QPolygonF &r) const Q_REQUIRED_RESULT; QPolygonF intersected(const QPolygonF &r) const Q_REQUIRED_RESULT;
QPolygonF subtracted(const QPolygonF &r) const Q_REQUIRED_RESULT; QPolygonF subtracted(const QPolygonF &r) const Q_REQUIRED_RESULT;
}; };
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygonF)
inline QPolygonF::QPolygonF(int asize) : QVector<QPointF>(asize) {} inline QPolygonF::QPolygonF(int asize) : QVector<QPointF>(asize) {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment