Commit Graph

12 Commits

Author SHA1 Message Date
Giorgos Tsiapaliwkas
77e5ff627c Merge branch 'plasma/terietorANDkokeroulis/KLocaleQMLBindings'
Fix the git conflicts
Conflicts:
	plasma/declarativeimports/CMakeLists.txt
	plasma/declarativeimports/test/contents/ui/Gallery.qml
2012-05-02 12:39:31 +03:00
Sebastian Kügler
4b9a633c73 New Plasma Export: org.kde.plasma.extras
Provides functionality beyond PlasmaComponent's API, currently just a
Title.
2012-03-15 19:57:43 +01:00
Giorgos Tsiapaliwkas
7a5880c6a5 add the locale folder in the cmake 2012-01-23 21:44:28 +02:00
Marco Martin
0fec8e54c5 move rangemodel in a components plugin 2011-09-13 21:21:29 +02:00
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
Marco Martin
a9d22b9877 build drag and drop plugin 2011-07-05 21:16:28 +02:00
Marco Martin
24f673a014 Revert "remove what can't still be merged"
This reverts commit 21dfef4f330bbee22d5154cadeb6c92fb46e1c51.

to resume the plasmacompoents directory that still need to be indipendent
2011-04-21 17:13:48 +02:00
Marco Martin
57975567cf remove what can't still be merged 2011-04-21 17:05:59 +02:00
Marco Martin
89c468c7a4 remove what can't still be merged 2011-04-21 16:57:57 +02:00
Marco Martin
110f85b3c6 actually install the components 2011-03-05 18:40:18 +01:00
Marco Martin
d36d2162ff build everything 2011-02-10 19:11:29 +01:00
Laurent Montel
890ba5f095 Compile it
svn path=/trunk/KDE/kdebase/runtime/; revision=1185366
2010-10-13 07:15:44 +00:00