diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-05-26 11:12:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-26 14:12:15 +0200 |
| commit | fedd1ba84d114cb3de46f528fe8e890b01c20106 (patch) | |
| tree | 2f3220ca73b782adef767c10479d878cb7d9bcb1 | |
| parent | 8097d67293928006811bc56cabdca98d7ba76de4 (diff) | |
Android: ensure unique IDs when extracting style data for layers
Indeterminate progress drawables can consist of multiple layers that
don't necessarily have an ID. Ensure that the extracted file names
contains unique IDs to avoid extracted layers overwriting each other.
Task-number: QTBUG-35081
Change-Id: I3dc48bf363510ded9b955aa51fa479c607541169
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java index bf874e5c68..7b6938e292 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -532,8 +532,11 @@ public class ExtractStyle { JSONArray array =new JSONArray(); for (int i = 0; i < nr; i++) { - JSONObject layerJsonObject=getDrawable(layers.getDrawable(i), filename+"__"+layers.getId(i)); - layerJsonObject.put("id", layers.getId(i)); + int id = layers.getId(i); + if (id == -1) + id = i; + JSONObject layerJsonObject=getDrawable(layers.getDrawable(i), filename+"__"+id); + layerJsonObject.put("id", id); array.put(layerJsonObject); } json.put("type", "layer"); |