Merge branch 'Plasma/5.8'

2016-11-28 09:28:01 +00:00 · 2016-11-28 09:28:01 +00:00 · f34222e060
parent aae24bb07d d0e0f6c88c
commit f34222e060
2 changed files with 7 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,9 @@
 project(KWIN)
+<<<<<<< HEAD
 set(PROJECT_VERSION "5.8.90")
+=======
+set(PROJECT_VERSION "5.8.4")
+>>>>>>> Plasma/5.8
 set(PROJECT_VERSION_MAJOR 5)

 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
--- a/kcmkwin/kwindecoration/qml/Previews.qml
+++ b/kcmkwin/kwindecoration/qml/Previews.qml
@ -107,8 +107,9 @@ ScrollView {
                    Button {
                        id: configureButton
                        anchors {
-                            left: inactivePreview.left
-                            bottom: inactivePreview.bottom
+                            left: parent.left
+                            bottom: parent.bottom
+                            margins: 20
                        }
                        enabled: model["configureable"]
                        iconName: "configure"