diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:56:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:56:17 +0100 |
| commit | 812bb236dd1622896b6a0ca9bbe1334a69855aa2 (patch) | |
| tree | 94031beabaf904e2380740cec8951b3c1152203c /src/gui/image/qimage.h | |
| parent | 79d78d814acad4e183e281aea9b131f396abe3fb (diff) | |
| parent | 50117d738af526cbfbd5afa50b9a501acb0fb9ce (diff) | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5
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 398424f75f..8112b8e8fd 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -217,7 +217,7 @@ public: #if QT_DEPRECATED_SINCE(5, 10) QT_DEPRECATED_X("Use sizeInBytes") int byteCount() const; #endif - qssize_t sizeInBytes() const; + qsizetype sizeInBytes() const; uchar *scanLine(int); const uchar *scanLine(int) const; |