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

Merge branch 'Plasma/5.0'

Browse source
This commit is contained in:
Kai Uwe Broulik 2014-08-11 12:27:40 +02:00
commit 16c432562d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -197,7 +197,7 @@ set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
set(KWIN_VERSION_MAJOR 5)
set(KWIN_VERSION_MINOR 0)
set(KWIN_VERSION_PATCH 0)
set(KWIN_VERSION_PATCH 1)
set(KWIN_VERSION ${KWIN_VERSION_MAJOR}.${KWIN_VERSION_MINOR}.${KWIN_VERSION_PATCH} )
set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

5
effects/presentwindows/main.qml
View file

@ -21,8 +21,9 @@ import QtQuick 2.0
import org.kde.plasma.components 2.0 as Plasma
Item {
width: 32
height: 32
width: units.iconSizes.medium
height: width
Plasma.Button {
id: closeButton
objectName: "closeButton"