~kubuntu-packagers/kubuntu-packaging/+git/ktp-call-ui:upstream

Last commit made on 2016-04-29
Get this branch:
git clone -b upstream https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ktp-call-ui
Members of Kubuntu Packagers can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

91da609... by Maximiliano Curia

Imported Upstream version 16.04.0

1e1ff29... by Diane Trout

update service file to use new CMAKE variable

353dd09... by Diane Trout

Imported Upstream version 0.9.0+git20151115

1181f2c... by Diane Trout

Prevent crashes from changes in how Bins are removed from the pipelines.

GStreamer reported warnings when trying to remove the sending bins
from the pipelines as they seem to be already unlinked when the
SinkManager::onPadUnlinked is called.

I discovered this by getting the source Element srcPad->parentElement()
and checking to see if that has a parent. After the bin is added to the
pipline it does have a parent, but by onPadRemoved it had been removed
from the pipeline.

I only tested audio calls which showed me that channelHandler()->pipeline()
could be null. I decided that that probably could happen to the video
path as well so added the guard condition there as well.

a320111... by Niels Ole Salscheider

Do not require KTp twice in CMakeLists.txt

REVIEW: 125501

65c9dc3... by Diane Trout

Revert "qCDebug(); doesn't print anything so we need to add some text to display"

This reverts commit d54a1b5178ce08d273bd9f0290cfb27b34aa41b4.

I was instructed to read http://woboq.com/blog/nice-debug-output-with-qt.html
which explains how to get more detailed logs out of qCDebug

d54a1b5... by Diane Trout

qCDebug(); doesn't print anything so we need to add some text to display

the old kDebug() did print the function name so an empty call to kDebug()
was meaningful. qCDebug doesn't, so we have to add a message in
order to get our function trace.

e4b06e6... by Niels Ole Salscheider

Add missing include

REVIEW: 125457

5b765f3... by Diane Trout

remove unneeded detritis from my merge attempt

dfd6c60... by Diane Trout

Merge branch 'frameworks'

This makes master compatibile with Qt5 / KF5