Marco Martin 284277083e Merge branch 'master' into plasma/viranch/qml-qmenu

2011-10-13 12:52:14 +02:00

..

CMakeLists.txt

Rename QMenuItem to QMenuAction, QMenuItem was already defined. Add support for separators in QMenus

2011-08-17 23:21:04 +05:30

qiconitem.cpp

paint grey when disabled

2011-08-20 17:43:36 +02:00

qiconitem.h

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qimageitem.cpp

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qimageitem.h

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qmenu.cpp

Rename QMenuItem to QMenuAction, QMenuItem was already defined. Add support for separators in QMenus

2011-08-17 23:21:04 +05:30

qmenu.h

Rename QMenuItem to QMenuAction, QMenuItem was already defined. Add support for separators in QMenus

2011-08-17 23:21:04 +05:30

qmenuaction.cpp

Directive changes + licensing

2011-08-17 23:26:21 +05:30

qmenuaction.h

Directive changes + licensing

2011-08-17 23:26:21 +05:30

qmldir

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qpixmapitem.cpp

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qpixmapitem.h

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00

qtextracomponentsplugin.cpp

Rename QMenuItem to QMenuAction, QMenuItem was already defined. Add support for separators in QMenus

2011-08-17 23:21:04 +05:30

qtextracomponentsplugin.h

Merged scratch/mart/plasma-components into subtree plasma/declarativeimports.

2011-02-10 14:41:47 -03:00