diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-08 15:29:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-08 17:34:00 +0000 |
| commit | 9b2ee419b4218126e00096ef5034e846ff3b9db1 (patch) | |
| tree | cd11989ad66ead8e506e83dea6359e3be972034e /src/android/jar/src/org/qtproject/qt5/android | |
| parent | 4fe68ffbe5c93244562f2b56292d4ecf5ce39f56 (diff) | |
| parent | 1fce111809f216383e60f56b57a9f68ccd2b766f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into merge5.5" into refs/staging/5.5
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt5/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 178de363d2..12ae8a65d8 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -1092,7 +1092,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); |