From 46c76aecc94751dfff3a4227b5f66c411723262d Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 10 Sep 2019 11:19:14 +0100 Subject: [PATCH 1/2] Update version number for 5.12.9 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d94d8b88cd..a921852d8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) project(KWIN) -set(PROJECT_VERSION "5.12.8") +set(PROJECT_VERSION "5.12.9") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0") From 444b88aef4d99686cd19886bf89ff1228cf7ca18 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Wed, 11 Sep 2019 20:46:04 +0300 Subject: [PATCH 2/2] Fix compilation error with Qt 5.9 QImage::sizeInBytes() was introduced in Qt 5.10. --- effects/screenshot/screenshot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/screenshot/screenshot.cpp b/effects/screenshot/screenshot.cpp index d6e121a8da..ca4a6ed798 100644 --- a/effects/screenshot/screenshot.cpp +++ b/effects/screenshot/screenshot.cpp @@ -107,7 +107,7 @@ static QSize pickWindowSize(const QImage &image) const uint32_t bytesPerPixel = image.depth() >> 3; const uint32_t bytesPerLine = image.bytesPerLine(); - if (image.sizeInBytes() <= maximumDataSize) { + if (image.byteCount() <= maximumDataSize) { return image.size(); }