diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 12:57:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-30 12:57:22 +0000 |
| commit | c35342ffeba10deecb2d8c0ce30a3a1a4ec1ee8d (patch) | |
| tree | 0b7782b3d8973d20ee4db36f768367b94e3d3394 /src/gui/image/qimage.h | |
| parent | 7200572b393534a2f503b810180276d2ae809c7a (diff) | |
| parent | 87204c856ae3d8495c41af998ac196a12fe1c779 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 11ad9b7510..5f2965042f 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -215,7 +215,7 @@ public: const uchar *constBits() const; #if QT_DEPRECATED_SINCE(5, 10) - QT_DEPRECATED int byteCount() const; + QT_DEPRECATED_X("Use sizeInBytes") int byteCount() const; #endif qssize_t sizeInBytes() const; |