diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-11 21:09:08 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-29 10:32:54 +0000 |
| commit | 1719be99a711ff3223779bc90f009c60ece1328c (patch) | |
| tree | cc3248ead42d411b018393aa32927d628a925cd9 /src/gui/image/qicon.h | |
| parent | 4a0140832de2f08c09557b7830ba6b5e25aa4c68 (diff) | |
Deprecate QIcon API which take a QWindow pointer
- pixmap(QWindow * ...)
Use pixmap(size, dpr) instead
- actualSize(QWindow *, ...)
Use actualSize(size) instead
Task-number: QTBUG-85885
Change-Id: Ia2d73eec9f040cd659f39c854463e3cd3ba72b93
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/image/qicon.h')
| -rw-r--r-- | src/gui/image/qicon.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 2ae9678e5a..964c29e785 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -83,10 +83,16 @@ public: inline QPixmap pixmap(int extent, Mode mode = Normal, State state = Off) const { return pixmap(QSize(extent, extent), mode, state); } QPixmap pixmap(const QSize &size, qreal devicePixelRatio, Mode mode = Normal, State state = Off) const; +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED_VERSION_X_6_0("Use pixmap(size, devicePixelRatio) instead") QPixmap pixmap(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const; +#endif QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const; +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED_VERSION_X_6_0("Use actualSize(size) instead") QSize actualSize(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const; +#endif QString name() const; |