diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-09-30 10:34:00 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-10-02 05:59:17 +0200 |
| commit | 538248d930a7c62212a18f81c31d381752beff13 (patch) | |
| tree | 1e7289412d777e014a3cb69ecbfd4858cff4e570 /src/android | |
| parent | 08c523a9a86c8ad8202e938e9e740b5234b54331 (diff) | |
Android: Don't include Apache code under LGPLv2 license
The code which extracts style assets for the Android style
is licensed under the Apache license, which is not compatible
with LGPLv2.1. It is, however, compatible with LGPLv3. This
means that the Android platform plugin cannot be LGPLv2.1
as long as this code is included.
To minimize licensing confusion, we default to only providing
LGPLv3 for Android. If you want to build a LGPLv2.1-compatible
library, you can add -no-android-style-assets to the
configuration. This will in turn enable the LGPLv2.1 in
the configure output, and it will disable the extraction
code in the platform plugin.
Running the Android style with an LGPLv2.1-compatible platform
plugin will work, but it will look horrible.
[ChangeLog][Android] Default open-source license for
Qt for Android is now LGPLv3. For compatibility with the LGPLv2.1
license, add "-no-android-style-assets" to your configuration.
Change-Id: I6c7b52140f38138520871fa7c69debbb4ee90e6c
Task-number: QTBUG-41365
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java | 3 |
1 files changed, 3 insertions, 0 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 06b3dab0df..0eda08c9d9 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -761,6 +761,9 @@ public class ExtractStyle { private JSONObject getJsonChunkInfo(int[] chunkData) throws JSONException { JSONObject jsonRect = new JSONObject(); + if (chunkData == null) + return jsonRect; + jsonRect.put("xdivs", getJsonArray(chunkData, 3, chunkData[0])); jsonRect.put("ydivs", getJsonArray(chunkData, 3 + chunkData[0], chunkData[1])); jsonRect.put("colors", getJsonArray(chunkData, 3 + chunkData[0] + chunkData[1], chunkData[2])); |