Merge pull request #6516 from jonaski/sizeinbytes

Use QImage::sizeInBytes() with Qt 5.10 and above
2020-01-06 00:12:02 +00:00 · 2020-01-06 00:12:02 +00:00 · 008c90ff29
parent 57841cf947 e98c11fe64
commit 008c90ff29
1 changed files with 4 additions and 0 deletions
--- a/src/widgets/osd_x11.cpp
+++ b/src/widgets/osd_x11.cpp
@ -66,7 +66,11 @@ QDBusArgument& operator<<(QDBusArgument& arg, const QImage& image) {
  int channels = i.isGrayscale() ? 1 : (i.hasAlphaChannel() ? 4 : 3);
  arg << i.depth() / channels;
  arg << channels;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+  arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.sizeInBytes());
+#else
  arg << QByteArray(reinterpret_cast<const char*>(i.bits()), i.byteCount());
+#endif
  arg.endStructure();
  return arg;
 }