From f26845cf8f8429303e670eb2f9ff08da63ac8f3b Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 22 Jan 2015 11:34:22 +0100 Subject: [PATCH 1/2] Update version number for 5.2.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01d2a6e464..550ef5760a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.1.95") +set(PROJECT_VERSION "5.2.0") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 52793c5e5b7439c98106dd7ebc02707547025cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 26 Jan 2015 10:27:39 +0100 Subject: [PATCH 2/2] [kcmkwin/deco] Fix build for Qt < 5.4 QQuickWidget::setClearColor is new in Qt 5.4. Sorry about the unintended breakage of building with Qt 5.3. --- kcmkwin/kwindecoration/kcm.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kcmkwin/kwindecoration/kcm.cpp b/kcmkwin/kwindecoration/kcm.cpp index 3892ba1915..c6b83b6c7e 100644 --- a/kcmkwin/kwindecoration/kcm.cpp +++ b/kcmkwin/kwindecoration/kcm.cpp @@ -396,7 +396,9 @@ bool ConfigurationModule::eventFilter(QObject *watched, QEvent *e) void ConfigurationModule::updateColors() { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) m_ui->view->setClearColor(m_ui->view->palette().color(QPalette::Window)); +#endif m_ui->view->rootContext()->setContextProperty("highlightColor", QPalette().color(QPalette::Highlight)); }