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 |
|
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 J. Seigo
|
6a68528d75
|
static is good enough here too
svn path=/trunk/KDE/kdebase/workspace/plasma/containmentactions/test/; revision=1017114
|
2009-08-29 18:30:36 +00:00 |
|
Aaron J. Seigo
|
5b435bae2b
|
menus should show on press, not release (though the paste plugin is correct in activating on release)
svn path=/trunk/KDE/kdebase/workspace/plasma/containmentactions/test/; revision=1015485
|
2009-08-25 16:14:49 +00:00 |
|
Chani Armitage
|
b39fb7db7f
|
replace hasConfig functions with a .desktop entry
everything's lovely and stable now, too :)
svn path=/trunk/KDE/kdebase/workspace/plasma/containmentactions/test/; revision=1015268
|
2009-08-25 03:22:43 +00:00 |
|
Chani Armitage
|
b6cd1d8582
|
rename folder
svn path=/trunk/KDE/kdebase/workspace/plasma/containmentactions/test/; revision=1012692
|
2009-08-17 23:40:25 +00:00 |
|