Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27
This commit is contained in:
Frederik Gladhorn
2014-12-17 16:53:41 +01:00
12 changed files with 223 additions and 25 deletions

View File

@@ -616,6 +616,8 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa
} else {
driver = QByteArray((const char*)vcap.driver);
name = QString::fromUtf8((const char*)vcap.card);
if (name.isEmpty())
name = entryInfo.fileName();
}
//qDebug() << "found camera: " << name;