Merge origin/master and fix conflicts

1 files changed, 1 insertions, 4 deletions

diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp

index 598b2bd0..2809de87 100644
--- a/src/notifications/ManagerLinux.cpp
+++ b/src/notifications/ManagerLinux.cpp
@@ -295,12 +295,9 @@ 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.byteCount());
-#else
         arg << QByteArray(reinterpret_cast<const char *>(i.bits()), i.sizeInBytes());
-#endif
         arg.endStructure();
+
         return arg;
 }