Martin Gräßlin
|
9291b18cee
|
Merge branch 'master' into frameworks-scratch
Conflicts:
CMakeLists.txt
kwin/effects.cpp
kwin/effects/logout/logout.cpp
kwin/effects/presentwindows/main.qml
kwin/effects/presentwindows/presentwindows.cpp
kwin/effects/presentwindows/presentwindows.h
kwin/effects/zoom/zoom_config.cpp
kwin/libkwineffects/kwinglutils_funcs.cpp
kwin/libkwineffects/kwinxrenderutils.cpp
kwin/nvidiahack.cpp
kwin/xcbutils.h
plasma/desktop/containments/desktop/plasma-containment-desktop.desktop
plasma/generic/wallpapers/image/image.cpp
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
|
2013-08-07 10:10:06 +02:00 |
|
Martin Gräßlin
|
47cf35720f
|
Present Window's close button ported to QtQuick 2
|
2013-08-05 14:08:23 +02:00 |
|
Thomas Lübking
|
287acae1db
|
handle closebutton arm state inside effect only
the enabled/disabled change is a useless distraction
implicitly fixes
BUG: 321810
FIXED-IN: 4.11
REVIEW: 111538
|
2013-07-19 21:16:44 +02:00 |
|
Martin Gräßlin
|
fb65c07bf7
|
Use a QDeclarativeView for button views in Present Windows and Desktop Grid
Declarative UI++
REVIEW: 109409
|
2013-03-12 08:40:46 +01:00 |
|