David Faure
|
083d157684
|
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
kdecore/network/k3datagramsocket.cpp
kdeui/actions/kstandardaction.cpp
kdeui/dialogs/kconfigdialogmanager.cpp
kdeui/icons/kicondialog.cpp
kdeui/itemviews/kviewstatesaver.h
kfile/knewfilemenu.cpp
kio/misc/kpac/downloader.cpp
kio/tests/kdirlistertest.cpp
kparts/browserextension.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/query/queryserviceclient.cpp
nepomuk/test/ratingpaintertestwidget.cpp
nepomuk/ui/kedittagsdialog.cpp
nepomuk/ui/ktagcloudwidget.cpp
nepomuk/ui/ktagdisplaywidget.cpp
nepomuk/ui/nepomukmassupdatejob.cpp
nepomuk/ui/tagwidget.cpp
nepomuk/utils/daterangeselectionwidget.cpp
nepomuk/utils/facetwidget.cpp
nepomuk/utils/searchwidget.cpp
plasma/containment.cpp
plasma/datacontainer.cpp
plasma/deprecated/animator.cpp
plasma/extenders/extender.cpp
plasma/plasma.h
plasma/scripting/wallpaperscript.cpp
tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)
|
2012-02-14 12:32:25 +01:00 |
|
Dawit Alemayehu
|
fb0b49af8c
|
Normalize all signal/slot connections.
REVIEW: 103728
|
2012-02-13 14:27:21 -05:00 |
|
David Faure
|
9057ce0c70
|
Fix compilation with the new cmake automoc stuff.
|
2012-02-08 23:34:07 +01:00 |
|
Stephen Kelly
|
8d37df4b8f
|
Remove moc includes that can be omitted.
Mostly these are "<name>.moc" style includes which are incorrect
compared to qmake and cmake automoc behaviour.
|
2012-01-31 22:44:36 +01:00 |
|
Aaron Seigo
|
94e4f35208
|
Package replaces PackageStructure+Package
|
2011-07-15 13:04:16 +02:00 |
|
Aaron Seigo
|
62429fbeb9
|
shhh
|
2011-05-26 18:44:00 +02:00 |
|
Aaron Seigo
|
3e236c281a
|
remove the dropUrls approach
|
2011-05-18 15:08:07 +02:00 |
|
Aaron J. Seigo
|
71f6f1dd18
|
addWallpaper -> setWallpaper, since the latter is what will be kept in the public api in libplasma2
svn path=/trunk/KDE/kdelibs/; revision=1217116
|
2011-01-25 20:51:16 +00:00 |
|
Aaron J. Seigo
|
c3c211f374
|
addurl into the scripting
svn path=/trunk/KDE/kdelibs/; revision=1217115
|
2011-01-25 20:41:50 +00:00 |
|
Petri Damstén
|
c1ee933143
|
Add description() also to WallpaperScript.
svn path=/trunk/KDE/kdelibs/; revision=1047385
|
2009-11-11 08:02:57 +00:00 |
|
Petri Damstén
|
289b9ac1eb
|
Add WallpaperScript.
Review: http://reviewboard.kde.org/r/1984/
svn path=/trunk/KDE/kdelibs/; revision=1042086
|
2009-10-29 05:54:11 +00:00 |
|