Giorgos Tsiapaliwkas 4c627ff830 Merge branch 'master' of git://anongit.kde.org/kde-runtime ...

Conflicts:
	plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml

2011-12-22 18:39:21 +02:00

..

platformcomponents/touch

fix the names from the imports

2011-12-22 17:34:09 +02:00

qml

Merge branch 'master' of git://anongit.kde.org/kde-runtime

2011-12-22 18:39:21 +02:00

CMakeLists.txt

fix the names from the imports

2011-12-22 17:34:09 +02:00

enums.cpp

a couple of enums more

2011-10-27 22:52:16 +02:00

enums.h

a couple of enums more

2011-10-27 22:52:16 +02:00

kdialogproxy.cpp

connect closeClicked as well to rejected

2011-11-03 18:28:15 +01:00

kdialogproxy.h

use a system KDialog for QueryDialog

2011-11-03 18:23:26 +01:00

plasmacomponentsplugin.cpp

ContextMenu item that accepts a model

2011-12-21 15:49:21 +01:00

plasmacomponentsplugin.h

move rangemodel in a components plugin

2011-09-13 21:21:29 +02:00

qmenu.cpp

triggered and triggerendindex signals

2011-12-21 21:55:32 +01:00

qmenu.h

triggered and triggerendindex signals

2011-12-21 21:55:32 +01:00

qmenuitem.cpp

qmenu bindings with the QtComponents api

2011-10-28 18:57:34 +02:00

qmenuitem.h

qmenu bindings with the QtComponents api

2011-10-28 18:57:34 +02:00

qrangemodel_p.h

move rangemodel in a components plugin

2011-09-13 21:21:29 +02:00

qrangemodel.cpp

export some enums

2011-10-27 22:33:51 +02:00

qrangemodel.h

export some enums

2011-10-27 22:33:51 +02:00