diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 10:12:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-06 22:12:16 +0000 |
| commit | ca65efb0ccad566eed89e7b81896299ca00fd2da (patch) | |
| tree | e83b14151156676dc8411d73471a3b999b53f542 /src/widgets | |
| parent | 71a1c66ab9ae48f575b80290e1d5e3624fd81704 (diff) | |
Add deprecation exclusion around deprecated calls in deprecated code
Fix:
io/qdir.cpp:1087:16: warning: ‘static void QResource::addSearchPath(const QString&)’ is deprecated: Use QDir::addSearchPath() instead [-Wdeprecated-declarations]
io/qprocess.cpp:1178:34: warning: ‘void QProcess::finished(int)’ is deprecated: Use QProcess::finished(int, QProcess::ExitStatus) instead [-Wdeprecated-declarations]
image/qpixmap.cpp:997:48: warning: ‘static QPixmap QPixmap::grabWidget(QObject*, const QRect&)’ is deprecated: Use QWidget::grab() instead [-Wdeprecated-declarations]
text/qfont.cpp:2218:29: warning: ‘QString QFont::lastResortFamily() const’ is deprecated [-Wdeprecated-declarations]
itemviews/qitemdelegate.cpp:1008:41: warning: ‘static QPixmap* QPixmapCache::find(const QString&)’ is deprecated: Use bool find(const QString &, QPixmap *) instead [-Wdeprecated-declarations]
Change-Id: I51259edc175b1f55f61ded3af50ebfffd8c304a8
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index f85004c49c..6e57e0c32b 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -1005,11 +1005,14 @@ static QString qPixmapSerial(quint64 i, bool enabled) QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const { const QString key = qPixmapSerial(pixmap.cacheKey(), enabled); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QPixmap *pm = QPixmapCache::find(key); if (pm) return pm; selectedPixmap(pixmap, palette, enabled); return QPixmapCache::find(key); +QT_WARNING_POP } #endif |