qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code style: split deprecation message into its own line 

Pick-to: 6.5
Change-Id: I6d871abe494a946ef88bfbff414745fbb2cbc1bf
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Fabian Kosmale 2023-01-23 11:45:19 +01:00
parent 396a7454e6
commit 0c5821b366
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/quick/items/qquickitem.h
View File

@ -317,7 +317,8 @@ public:
void polish();
#if QT_DEPRECATED_SINCE(6, 5)
QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectFromItem") void mapFromItem(QQmlV4Function*) const;
QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectFromItem")
void mapFromItem(QQmlV4Function*) const;
#endif
Q_INVOKABLE QPointF mapFromItem(const QQuickItem *item, const QPointF &point) const;
// overloads mainly exist for QML
@ -326,7 +327,8 @@ public:
Q_INVOKABLE QRectF mapFromItem(const QQuickItem *item, qreal x, qreal y, qreal width, qreal height) const;
#if QT_DEPRECATED_SINCE(6, 5)
QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectToItem") void mapToItem(QQmlV4Function*) const;
QT_DEPRECATED_VERSION_X_6_5("Use typed overload or mapRectToItem")
void mapToItem(QQmlV4Function*) const;
#endif
Q_INVOKABLE QPointF mapToItem(const QQuickItem *item, const QPointF &point) const;
// overloads mainly exist for QML
@ -335,14 +337,16 @@ public:
Q_INVOKABLE QRectF mapToItem(const QQuickItem *item, qreal x, qreal y, qreal width, qreal height) const;
#if QT_DEPRECATED_SINCE(6, 5)
QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") Q_REVISION(2, 7) void mapFromGlobal(QQmlV4Function*) const;
QT_DEPRECATED_VERSION_X_6_5("Use the typed overload")
Q_REVISION(2, 7) void mapFromGlobal(QQmlV4Function*) const;
#endif
Q_REVISION(2, 7) Q_INVOKABLE QPointF mapFromGlobal(qreal x, qreal y) const;
// overload mainly exists for QML
Q_REVISION(2, 7) Q_INVOKABLE QPointF mapFromGlobal(const QPointF &point) const;
#if QT_DEPRECATED_SINCE(6, 5)
QT_DEPRECATED_VERSION_X_6_5("Use the typed overload") Q_REVISION(2, 7) void mapToGlobal(QQmlV4Function*) const;
QT_DEPRECATED_VERSION_X_6_5("Use the typed overload")
Q_REVISION(2, 7) void mapToGlobal(QQmlV4Function*) const;
#endif
Q_REVISION(2, 7) Q_INVOKABLE QPointF mapToGlobal(qreal x, qreal y) const;
// overload only exist for QML