083d157684
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) |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| config.ui | ||
| plasma-containmentactions-test.desktop | ||
| test.cpp | ||
| test.h | ||