diff options
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 65b9d62dfa..b581248774 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -934,8 +934,6 @@ static void sendResizeEvents(QWidget *target) QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle) { QPixmap pixmap; - // ### Qt5: should we keep or remove this method? - // SC solution would be to install a callback form QtWidgets, but ugly. qWarning("QPixmap::grabWidget is deprecated, use QWidget::grab() instead"); if (!widget) return pixmap; diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 0b21be5c8e..db92965274 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -84,11 +84,11 @@ public: operator QVariant() const; - bool isNull() const; // ### Qt 5: make inline + bool isNull() const; int devType() const; - int width() const; // ### Qt 5: make inline - int height() const; // ### Qt 5: make inline + int width() const; + int height() const; QSize size() const; QRect rect() const; int depth() const; |