Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
Conflicts: kdecore/jobs/kjob.h kdecore/kernel/kcmdlineargs.cpp kdewebkit/kwebpluginfactory.cpp plasma/service.cpp solid/solid/CMakeLists.txt solid/solid/backends/udev/udevdevice.cpp solid/solid/backends/udev/udevmanager.cpp solid/solid/backends/udev/udevportablemediaplayer.cpp
This commit is contained in:
commit
c8d2e51e43
@ -237,7 +237,7 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject
|
||||
}
|
||||
} else {
|
||||
#ifndef NDEBUG
|
||||
kDebug() << "Not a valid group!"<<d->config->groupList();
|
||||
kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user