summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2014-09-30 10:34:00 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2014-10-02 05:59:17 +0200
commit538248d930a7c62212a18f81c31d381752beff13 (patch)
tree1e7289412d777e014a3cb69ecbfd4858cff4e570 /configure
parent08c523a9a86c8ad8202e938e9e740b5234b54331 (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 'configure')
-rwxr-xr-xconfigure44
1 files changed, 37 insertions, 7 deletions
diff --git a/configure b/configure
index efcfd7b3bf..74ff31eb04 100755
--- a/configure
+++ b/configure
@@ -627,6 +627,7 @@ CFG_PPS=auto
CFG_QNX_IMF=auto
CFG_LGMON=auto
CFG_SYSTEM_PROXIES=no
+CFG_ANDROID_STYLE_ASSETS=yes
# Target architecture
CFG_ARCH=
@@ -2144,6 +2145,13 @@ while [ "$#" -gt 0 ]; do
android-toolchain-version)
CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION="$VAL"
;;
+ android-style-assets)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_ANDROID_STYLE_ASSETS="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
l*) # -lfoo
if [ "$VAL" = "yes" ]; then
L_FLAGS="$L_FLAGS -l\"${VAR#l}\""
@@ -2565,6 +2573,14 @@ Android options:
-android-toolchain-version ..... Sets the android toolchain version
(default $CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION)
+
+ -no-android-style-assets ....... Do not compile in the code which automatically extracts
+ style assets from the run-time device. Setting this will
+ make the Android style behave incorrectly, but will enable
+ compatibility with the LGPL2.1 license.
+ * -android-style-assets .......... Compile the code which automatically extracts style assets
+ from the run-time device. This option will make the
+ Android platform plugin incompatible with the LGPL2.1.
EOF
exit 0
@@ -2826,11 +2842,20 @@ fi
if [ "$Edition" = "OpenSource" ]; then
while true; do
- echo "You are licensed to use this software under the terms of"
- echo "the Lesser GNU General Public License (LGPL) versions 2.1."
- echo "You are also licensed to use this software under the terms of"
- echo "the GNU Lesser General Public License (LGPL) versions 3."
- affix="either"
+ if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then
+ echo "You are licensed to use this software under the terms of"
+ echo "the Lesser GNU General Public License (LGPL) versions 2.1."
+ echo "You are also licensed to use this software under the terms of"
+ echo "the GNU Lesser General Public License (LGPL) versions 3."
+ affix="either"
+ showLGPL2="yes"
+ else
+ echo "You are licensed to use this software under the terms of"
+ echo "the GNU Lesser General Public License (LGPL) versions 3."
+ showLGPL2="no"
+ affix="the"
+ fi
+
echo
if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then
echo "You have already accepted the terms of the $EditionString license."
@@ -2839,7 +2864,9 @@ if [ "$Edition" = "OpenSource" ]; then
if [ -f "$relpath/LICENSE.LGPLv3" ]; then
echo "Type '3' to view the GNU Lesser General Public License version 3."
fi
- echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
+ if [ "$showLGPL2" = "yes" ]; then
+ echo "Type 'L' to view the Lesser GNU General Public License version 2.1."
+ fi
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."
echo
@@ -2855,7 +2882,7 @@ if [ "$Edition" = "OpenSource" ]; then
exit 1
elif [ "$acceptance" = "3" ]; then
more "$relpath/LICENSE.LGPLv3"
- elif [ "$acceptance" = "L" ]; then
+ elif [ "$acceptance" = "L" ] && [ "$showLGPL2" = "yes" ]; then
more "$relpath/LICENSE.LGPLv21"
fi
done
@@ -3167,6 +3194,9 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
esac
QMAKE_CONF_COMPILER=$CFG_DEFAULT_ANDROID_NDK_ROOT/toolchains/$ANDROID_NDK_TOOLS_PREFIX-$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/$CFG_DEFAULT_ANDROID_NDK_HOST/bin/$ANDROID_NDK_TOOLS_PREFIX-g++
TEST_COMPILER="$QMAKE_CONF_COMPILER --sysroot=$CFG_DEFAULT_ANDROID_NDK_ROOT/platforms/$CFG_DEFAULT_ANDROID_PLATFORM/$ANDROID_PLATFORM_ARCH/"
+ if [ "$CFG_ANDROID_STYLE_ASSETS" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG android-style-assets"
+ fi
fi
if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then