Commit Graph

15 Commits

Author SHA1 Message Date
Marco Martin
0e9c604043 always permit to pop 2012-02-14 17:59:23 +01:00
Marco Martin
5e6fc957f2 documentation++ 2012-02-10 19:40:33 +01:00
Marco Martin
46ba74adb1 Merge branch 'KDE/4.8'
Conflicts:
	kurifilter-plugins/ikws/searchproviders/cpan.desktop
2012-01-26 22:06:22 +01:00
Marco Martin
0dfbaa1525 avoid double pushes 2012-01-26 21:59:20 +01:00
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
Giorgos Tsiapaliwkas
9a1e332b9b move the private components into a private subdir 2011-12-22 15:16:01 +02:00
Marco Martin
de666a6fd3 Documentanted -> Documented 2011-12-22 11:53:15 +01:00
Marco Martin
68c013293c documentation for Page and PageStack 2011-12-19 17:34:54 +01:00
Marco Martin
d72f2d7c3c Merge branch 'master' into plasma-components-doc
Conflicts:
	plasma/declarativeimports/plasmacomponents/qml/Button.qml
2011-12-16 18:53:25 +01:00
Marco Martin
42aeaebb4e fix loading of toolbar of initialPage 2011-11-28 17:25:26 +01:00
Giorgos Tsiapaliwkas
72f52c5d29 Merge branch 'master' into plasma-components-doc 2011-11-16 18:06:25 +02:00
Giorgos Tsiapaliwkas
da4c10deff Init docu for PageStack.qml 2011-11-08 09:30:13 +02:00
Marco Martin
5282287b55 anchors a page to its container 2011-11-01 22:45:38 +01:00
Marco Martin
3ac2a8c875 if stack creates the component, is the owner too
leak--
2011-10-31 16:42:40 +01:00
Marco Martin
56dc7f6314 Page and PageStack 2011-10-30 19:47:08 +01:00