diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2015-04-24 15:21:21 +0200 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@theqtcompany.com> | 2015-04-30 19:35:05 +0000 |
| commit | 119c5ec93f3b32cb62456c3a42c54ebb2c42e567 (patch) | |
| tree | d6bf84b91636a60fbe0d1ee1ff52eeed351105f5 /src/android | |
| parent | ef622d55ca990e70f60d11964fa2f3651ccd4522 (diff) | |
Android: Fix wrong field name in ExtractStyle.java
In Android 5.1 the field name for the inset state member in
InsetDrawable changed from mInsetState to mState.
Task-number: QTBUG-45714
Change-Id: I0ebada1ef90954013e5357cbd10df925f8f05295
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 4 |
1 files changed, 3 insertions, 1 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 a8583cde17..79722183bf 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -1100,7 +1100,9 @@ public class ExtractStyle { { try { InsetDrawable d = (InsetDrawable)drawable; - Object mInsetStateObject = getAccessibleField(InsetDrawable.class, "mInsetState").get(d); + // mInsetState changed to mState in Android 5.1 (22) + Object mInsetStateObject = getAccessibleField(InsetDrawable.class, (Build.VERSION.SDK_INT > 21) ? "mState" + : "mInsetState").get(d); Rect _padding = new Rect(); boolean hasPadding = d.getPadding(_padding); return getDrawable(getAccessibleField(mInsetStateObject.getClass(), "mDrawable").get(mInsetStateObject), filename, hasPadding ? _padding : null); |