Merge branch 'master' into frameworks-scratch
a458802690d6
Actions

Authored by graesslin on Aug 7 2013, 7:53 AM.

Description

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

Details

Committed

graesslin

Aug 7 2013, 8:10 AM

Parents

R108:b33d072966b6: Merge branch 'KDE/4.11'
R108:e1f1bccb208a: explicitly compare latin1 strings in qassert (fixes build with debugfull)

Branches

Unknown

Tags

Unknown

graesslin committed R108:a458802690d6: Merge branch 'master' into frameworks-scratch (authored by graesslin).Aug 7 2013, 8:10 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
b33d072966b6	graesslin	Merge branch 'KDE/4.11'	Aug 7 2013
fa30984c1497	luebking	poll mouse at 20Hz	Aug 6 2013
bba18b584cf1	luebking	crossfade for resize effect	Aug 6 2013
70a9b219bb40	luebking	implement crossfading on xrender	Aug 6 2013
6c966afb086a	luebking	Merge branch 'KDE/4.11'	Aug 6 2013
544e917b8500	luebking	poll mouse at 20Hz	Aug 6 2013
25b0666c1549	luebking	crossfade for resize effect	Aug 6 2013
13409cf57e98	luebking	implement crossfading on xrender	Aug 6 2013
2180fe6b8f00	fredrik/graesslin	kwin: Make PaintRedirector work without NPOT texture support	Aug 6 2013
410343ae40ad	graesslin	Better activation check in KillWindow	Aug 6 2013
23b0509ef3b0	luebking	Merge branch 'KDE/4.11'	Aug 6 2013
1d3175c1fd73	luebking	validate screens w/o direct update	Aug 6 2013
2ddc4adf34db	luebking	Merge branch 'KDE/4.11'	Aug 6 2013
dc3c006f142d	luebking	protect kwin against broken tabbox installation	Aug 6 2013
7ec4e22fd6d0	luebking	add synthetic repaint after crossfade finished	Aug 6 2013
33cab5bb6616	luebking	Hotfix GL crossfading	Aug 6 2013
571f1a57d1cd	luebking	Merge branch 'KDE/4.11'	Aug 5 2013
9950af3e5c4a	luebking	write back unsupported (kwin-intel) unredirection	Aug 5 2013
c326d4c64ad5	luebking	support fps counter text on xrender	Aug 5 2013
076d2d70c049	luebking	add XRenderPicture(QImage) constructor	Aug 5 2013
1ac5cf1d73e0	luebking	no layer repaints for the window geometry labels	Aug 5 2013
9245c3580ed3	luebking	bind unredirection change to unredirection update	Aug 5 2013
c16a70a7a598	luebking	add configRequest rule update	Aug 5 2013
a443c79d026a	luebking	remove nvidiahack lib	Aug 5 2013
d6249b5024db	broulik	Merge branch 'KDE/4.11'	Aug 5 2013
c8d7e1299e73	l10n daemon script	SVN_SILENT made messages (.desktop file)	Aug 5 2013
ad3f9ac2e6e7	l10n daemon script	SVN_SILENT made messages (.desktop file)	Aug 5 2013
49aeea520c59	l10n daemon script	SVN_SILENT made messages (.desktop file)	Aug 4 2013
2810c6ec47f6	l10n daemon script	SVN_SILENT made messages (.desktop file)	Aug 3 2013
19d1e9db23eb	luebking	Merge branch 'KDE/4.11'	Aug 2 2013
0256c73eab7c	luebking	desk-grid: bind sc editor keyChange to kcm changed	Aug 2 2013
9754a8aa1008	luebking	don't require geometry changes for quick max/tile	Aug 2 2013
e1f3b4719453	luebking	keep buffer swap pref automatic until GPU detected	Aug 2 2013
00ca9e2e384a	luebking	exit cube on doubleclick	Aug 2 2013
79a3dbde7e10	luebking	re-fix bouncing startup feedback	Aug 2 2013
0b8ddb84b6fd	luebking	update packing logics to honor activities and tabs	Aug 2 2013
8e75831adef8	luebking	prevent yield/swap cpu overhead on nvidia	Aug 2 2013
35add9bdaeec	luebking	fix rendertarget warning on xrender	Aug 2 2013
c56050aacca3	luebking	fix magnifier effect exit	Aug 2 2013
2849c6d69020	broulik	Merge branch 'KDE/4.11'	Aug 1 2013
cca3987c0f54	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 31 2013
8d5214e3d7e1	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 31 2013
a83c177f07f5	markg	Merge branch 'KDE/4.11'	Jul 30 2013
8aceba2ca5f9	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 30 2013
abfe6cb877d4	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 30 2013
519327881ada	hein	Merge branch 'KDE/4.11'	Jul 29 2013
5452c872c497	Casian Andrei	Fix many color correction problems with OpenGL ES	Jul 28 2013
df1865d10cf4	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jul 27 2013
e9a49b17aecf	luebking	Merge branch 'KDE/4.11'	Jul 24 2013
9cc3b8653508	luebking	fix passive startup feedback	Jul 24 2013

Changes (129)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
M		activation.cpp
M		client.cpp
M		clients/aurorae/src/kwindecoration.desktop
M		clients/aurorae/themes/plastik/package/metadata.desktop
M		composite.cpp
M		cursor.cpp
M		data/CMakeLists.txt
A		data/kwin_translate_confrequest_rule.sh
A		data/kwin_translate_confrequest_rule.upd
M		deleted.cpp
M		deleted.h
M		effects.cpp
M		effects.h
M		effects/coverswitch/coverswitch.desktop
M		effects/coverswitch/coverswitch_config.desktop
M		effects/cube/cube.cpp
M		effects/cube/cube.h
M		effects/desktopgrid/desktopgrid.cpp
M		effects/desktopgrid/desktopgrid.desktop
M		effects/desktopgrid/desktopgrid_config.cpp
M		effects/dialogparent/package/contents/code/main.js
M		effects/flipswitch/flipswitch.desktop
M		effects/flipswitch/flipswitch_config.desktop
M		effects/invert/data/1.10/invert.frag
M		effects/invert/data/1.40/invert.frag
M		effects/kscreen/kscreen.desktop
M		effects/logout/CMakeLists.txt
A	(dir)	effects/logout/data/1.10/
V		effects/logout/data/{1.10 ← }/logout-blur.frag
V		effects/logout/data/{1.10 ← }/vignetting.frag
A	(dir)	effects/logout/data/1.40/
V		effects/logout/data/{1.40/logout-blur.frag ← logout-blur-140.frag}
V		effects/logout/data/{1.40/vignetting.frag ← vignetting-140.frag}
V		effects/logout/data/{logout-blur-140.frag → 1.40/logout-blur.frag}
V		effects/logout/data/{ → 1.10}/logout-blur.frag
V		effects/logout/data/{vignetting-140.frag → 1.40/vignetting.frag}
V		effects/logout/data/{ → 1.10}/vignetting.frag
M		effects/logout/logout.cpp
M		effects/logout/logout.desktop
M		effects/logout/logout.h
M		effects/magnifier/magnifier.cpp
M		effects/magnifier/magnifier.desktop
M		effects/magnifier/magnifier_config.desktop
M		effects/maximize/package/metadata.desktop
M		effects/mouseclick/mouseclick.desktop
M		effects/mouseclick/mouseclick_config.desktop
M		effects/presentwindows/main.qml
M		effects/presentwindows/presentwindows.cpp
M		effects/presentwindows/presentwindows.h
M		effects/resize/resize.cpp
M		effects/resize/resize.desktop
M		effects/resize/resize.h
M		effects/resize/resize_config.desktop
M		effects/screenedge/screenedgeeffect.desktop
M		effects/screenshot/screenshot.desktop
M		effects/showfps/showfps.cpp
M		effects/showfps/showfps.h
M		effects/slideback/slideback.desktop
M		effects/startupfeedback/startupfeedback.cpp
M		effects/windowgeometry/windowgeometry.cpp
M		effects/windowgeometry/windowgeometry.desktop
M		effects/zoom/zoom.cpp
M		effects/zoom/zoom_config.cpp
M		eglonxbackend.cpp
M		events.cpp
M		geometry.cpp
M		glxbackend.cpp
M		group.cpp
M		kcmkwin/kwincompositing/kwincompositing.desktop
M		kcmkwin/kwindecoration/kwindecoration.desktop
M		kcmkwin/kwinoptions/focus.ui
M		kcmkwin/kwinoptions/kwinactions.desktop
M		kcmkwin/kwinoptions/kwinadvanced.desktop
M		kcmkwin/kwinoptions/kwinfocus.desktop
M		kcmkwin/kwinoptions/kwinmoving.desktop
M		kcmkwin/kwinoptions/kwinoptions.desktop
M		kcmkwin/kwinrules/kwinrules.desktop
M		kcmkwin/kwinrules/ruleswidget.cpp
M		kcmkwin/kwinrules/ruleswidgetbase.ui
M		kcmkwin/kwinscreenedges/kwinscreenedges.desktop
M		kcmkwin/kwintabbox/kwintabbox.desktop
M		killwindow.cpp
M		kwin.notifyrc
M		lanczosfilter.cpp
M		libkwineffects/kwinanimationeffect.cpp
M		libkwineffects/kwineffects.cpp
M		libkwineffects/kwineffects.h
M		libkwineffects/kwinglcolorcorrection.cpp
M		libkwineffects/kwinglplatform.cpp
M		libkwineffects/kwinglplatform.h
M		libkwineffects/kwinglutils.cpp
M		libkwineffects/kwinglutils.h
M		libkwineffects/kwinglutils_funcs.cpp
M		libkwineffects/kwinglutils_funcs.h
M		libkwineffects/kwinxrenderutils.cpp
M		libkwineffects/kwinxrenderutils.h
M		main.cpp
M		netinfo.cpp
D		nvidiahack.cpp
M		options.cpp
M		paintredirector.cpp
M		placement.cpp
M		scene_opengl.cpp
M		scene_xrender.cpp
M		screenedge.cpp
M		screens.cpp
M		screens.h
M		scripting/kwinscript.desktop
M		tabbox/declarative.cpp
M		tabbox/kwindesktopswitcher.desktop
M		tabbox/kwinwindowswitcher.desktop
M		tabbox/qml/IconTabBox.qml
M		tabbox/qml/clients/big_icons/metadata.desktop
M		tabbox/qml/clients/compact/metadata.desktop
M		tabbox/qml/clients/informative/metadata.desktop
M		tabbox/qml/clients/present_windows/metadata.desktop
M		tabbox/qml/clients/small_icons/metadata.desktop
M		tabbox/qml/clients/text/metadata.desktop
M		tabbox/qml/clients/thumbnails/metadata.desktop
M		tabbox/qml/clients/window_strip/metadata.desktop
M		tabbox/qml/desktops/informative/metadata.desktop
M		tabbox/qml/desktops/previews/metadata.desktop
M		tabbox/tabboxhandler.cpp
M		toplevel.cpp
M		toplevel.h
M		unmanaged.cpp
M		workspace.cpp
M		xcbutils.h

Merge branch 'master' into frameworks-scratcha458802690d6Actions

Description

Details

Merged Changes

Changes (129)Show All Changes

Very Large Commit

R108:a458802690d6

CMakeLists.txt

activation.cpp

client.cpp

clients/aurorae/src/kwindecoration.desktop

clients/aurorae/themes/plastik/package/metadata.desktop

composite.cpp

cursor.cpp

data/CMakeLists.txt

data/kwin_translate_confrequest_rule.sh

data/kwin_translate_confrequest_rule.upd

deleted.cpp

deleted.h

effects.cpp

effects.h

effects/coverswitch/coverswitch.desktop

effects/coverswitch/coverswitch_config.desktop

effects/cube/cube.cpp

effects/cube/cube.h

effects/desktopgrid/desktopgrid.cpp

effects/desktopgrid/desktopgrid.desktop

effects/desktopgrid/desktopgrid_config.cpp

effects/dialogparent/package/contents/code/main.js

effects/flipswitch/flipswitch.desktop

effects/flipswitch/flipswitch_config.desktop

effects/invert/data/1.10/invert.frag

effects/invert/data/1.40/invert.frag

effects/kscreen/kscreen.desktop

effects/logout/CMakeLists.txt

effects/logout/data/1.10/logout-blur.frag

effects/logout/data/1.10/vignetting.frag

effects/logout/data/1.40/logout-blur.frag

effects/logout/data/1.40/vignetting.frag

effects/logout/data/logout-blur-140.frag

effects/logout/data/logout-blur.frag

effects/logout/data/vignetting-140.frag

effects/logout/data/vignetting.frag

effects/logout/logout.cpp

effects/logout/logout.desktop

effects/logout/logout.h

effects/magnifier/magnifier.cpp

effects/magnifier/magnifier.desktop

effects/magnifier/magnifier_config.desktop

effects/maximize/package/metadata.desktop

effects/mouseclick/mouseclick.desktop

effects/mouseclick/mouseclick_config.desktop

effects/presentwindows/main.qml

effects/presentwindows/presentwindows.cpp

effects/presentwindows/presentwindows.h

effects/resize/resize.cpp

effects/resize/resize.desktop

effects/resize/resize.h

effects/resize/resize_config.desktop

effects/screenedge/screenedgeeffect.desktop

effects/screenshot/screenshot.desktop

effects/showfps/showfps.cpp

effects/showfps/showfps.h

effects/slideback/slideback.desktop

effects/startupfeedback/startupfeedback.cpp

effects/windowgeometry/windowgeometry.cpp

effects/windowgeometry/windowgeometry.desktop

effects/zoom/zoom.cpp

effects/zoom/zoom_config.cpp

eglonxbackend.cpp

events.cpp

geometry.cpp

glxbackend.cpp

group.cpp

kcmkwin/kwincompositing/kwincompositing.desktop

kcmkwin/kwindecoration/kwindecoration.desktop

kcmkwin/kwinoptions/focus.ui

kcmkwin/kwinoptions/kwinactions.desktop

kcmkwin/kwinoptions/kwinadvanced.desktop

kcmkwin/kwinoptions/kwinfocus.desktop

Merge branch 'master' into frameworks-scratch
a458802690d6
Actions

Changes (129)
Show All Changes