Marco Martin e5b43a7357 Merge branch 'master' into plasma/declarative ...

Conflicts:
	plasma/declarativeimports/core/CMakeLists.txt
	plasma/declarativeimports/core/corebindingsplugin.cpp
	plasma/declarativeimports/plasmacomponents/BusyIndicator.qml
	plasma/declarativeimports/plasmacomponents/ScrollBar.qml
	plasma/declarativeimports/plasmacomponents/qmldir

2011-09-13 20:43:59 +02:00

..

BusyIndicator.qml

Add copyright for BusyIndicator

2011-07-08 19:21:24 -03:00

Button.qml

Fix comments about graphics for plasma components enabled/disabled properties

2011-07-18 18:49:45 -03:00

ButtonColumn.qml

Add ButtonRow and ButtonColumn

2011-07-08 19:56:50 -03:00

ButtonGroup.js

Add ButtonRow and ButtonColumn

2011-07-08 19:56:50 -03:00

ButtonRow.qml

Add ButtonRow and ButtonColumn

2011-07-08 19:56:50 -03:00

CheckBox.qml

graphics for checkboxes and radio buttons

2011-08-30 23:04:45 +02:00

DualStateButton.qml

Fix comments about graphics for plasma components enabled/disabled properties

2011-07-18 18:49:45 -03:00

Highlight.qml

Fix Highlight plasma component margins

2011-07-15 20:51:42 -03:00

ProgressBar.qml

Add ProgressBar plasma component

2011-07-25 00:14:51 -03:00

qmldir

Add ProgressBar plasma component

2011-07-25 00:14:51 -03:00

RadioButton.qml

graphics for checkboxes and radio buttons

2011-08-30 23:04:45 +02:00

ScrollBar.qml

Fix ScrollBar plasma component incrementValue function

2011-07-21 17:48:31 -03:00

ScrollDecorator.qml

Add ScrollDecorator component

2011-07-14 11:04:20 -03:00

Slider.qml

Add enabled/disable support for Slider plasma component

2011-07-18 19:16:38 -03:00

Switch.qml

graphics for checkboxes and radio buttons

2011-08-30 23:04:45 +02:00

TextArea.qml

Add TextArea plasma component

2011-07-22 16:12:36 -03:00

TextField.qml

Add TextField plasma component

2011-07-21 10:16:34 -03:00