Android: Fix crash when using images in QML
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Thu, 6 Feb 2014 07:37:58 +0000 (08:37 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 7 Feb 2014 06:49:56 +0000 (07:49 +0100)
commitbde1e6718385c4c7c92bfda9ee4b52b99ff92214
treeca95a8e08d08b784b6beaa6159f8d3d3e3ccc041
parent1298960aaa18217df44458312a8580a4d97b76e2
Android: Fix crash when using images in QML

Because qtdeclarative was merged back from stable and qtbase is
still lagging behind, they have become unsynchronized, causing
crashes when trying to get the device name from the platform
plugin and failing. To work around this until the merge goes
through, I've added a simple guard.

Task-number: QTBUG-36658
Change-Id: Ibc399ed325a1fbdeccad85ed8d4841edb7b2ba5d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
src/quick/scenegraph/util/qsgatlastexture.cpp
src/quick/scenegraph/util/qsgtexture.cpp