yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.8'

Browse source
This commit is contained in:
David Edmundson 2016-11-28 09:28:01 +00:00
commit f34222e060
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,5 +1,9 @@
project(KWIN) project(KWIN)
<<<<<<< HEAD
set(PROJECT_VERSION "5.8.90") set(PROJECT_VERSION "5.8.90")
=======
set(PROJECT_VERSION "5.8.4")
>>>>>>> Plasma/5.8
set(PROJECT_VERSION_MAJOR 5) set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

5
kcmkwin/kwindecoration/qml/Previews.qml
View file

@ -107,8 +107,9 @@ ScrollView {
Button { Button {
id: configureButton id: configureButton
anchors { anchors {
left: inactivePreview.left left: parent.left
bottom: inactivePreview.bottom bottom: parent.bottom
margins: 20
} }
enabled: model["configureable"] enabled: model["configureable"]
iconName: "configure" iconName: "configure"