Remove C++11 code in iMX6 video node plugin.
Use Q_FOREACH instead of C++11 range-based For loops. Task-number: QTBUG-38900 Change-Id: I2b9f8444f2ac3ae71811112244c687cab79753c9 Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
92096afdb4
commit
69598e22f3
@@ -70,7 +70,7 @@ QSGVivanteVideoMaterial::QSGVivanteVideoMaterial() :
|
|||||||
|
|
||||||
QSGVivanteVideoMaterial::~QSGVivanteVideoMaterial()
|
QSGVivanteVideoMaterial::~QSGVivanteVideoMaterial()
|
||||||
{
|
{
|
||||||
for (GLuint id : mBitsToTextureMap.values()) {
|
Q_FOREACH (GLuint id, mBitsToTextureMap.values()) {
|
||||||
#ifdef QT_VIVANTE_VIDEO_DEBUG
|
#ifdef QT_VIVANTE_VIDEO_DEBUG
|
||||||
qDebug() << "delete texture: " << id;
|
qDebug() << "delete texture: " << id;
|
||||||
#endif
|
#endif
|
||||||
@@ -154,7 +154,7 @@ GLuint QSGVivanteVideoMaterial::vivanteMapping(QVideoFrame vF)
|
|||||||
mWidth = vF.width();
|
mWidth = vF.width();
|
||||||
mHeight = vF.height();
|
mHeight = vF.height();
|
||||||
mFormat = vF.pixelFormat();
|
mFormat = vF.pixelFormat();
|
||||||
for (GLuint id : mBitsToTextureMap.values()) {
|
Q_FOREACH (GLuint id, mBitsToTextureMap.values()) {
|
||||||
#ifdef QT_VIVANTE_VIDEO_DEBUG
|
#ifdef QT_VIVANTE_VIDEO_DEBUG
|
||||||
qDebug() << "delete texture: " << id;
|
qDebug() << "delete texture: " << id;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user