Bump required Qt version to 5.12

2022-01-29 01:33:40 +01:00
parent e511b2faf9
commit f8d2c7eba3
31 changed files with 24 additions and 165 deletions
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -84,11 +84,7 @@ QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image) {
  qint32 bitspersample = i.depth() / channels;
  arg << bitspersample;
  arg << channels;
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
  arg << QByteArray(reinterpret_cast<const char*>(i.constBits()), static_cast<int>(i.sizeInBytes()));
-#else
-  arg << QByteArray(reinterpret_cast<const char*>(i.constBits()), i.byteCount());
-#endif
  arg.endStructure();

  return arg;