diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-29 16:31:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-30 21:15:40 +0200 |
| commit | cc692bb58c8a39f06eb30c04cfcb61fa466d18ae (patch) | |
| tree | 3e32794fa51a2d85356596710b11c8290388b8da /src/gui/image/qimage.h | |
| parent | 47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 (diff) | |
Get rid of some #ifdef qt6
None of this code is even compiled in qt6.
Change-Id: I5891cc9459320083ad3908fcbf646f3ba75b8a4d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index d95055e35d..89a696d5d6 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -115,13 +115,8 @@ public: QImage(int width, int height, Format format); QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) QImage(uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); QImage(const uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); -#else - QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); - QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr); -#endif #ifndef QT_NO_IMAGEFORMAT_XPM explicit QImage(const char * const xpm[]); |