Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14

1 files changed, 37 insertions, 8 deletions

diff --git a/configure b/configure
index d610759ae2..bfca4fab40 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=
@@ -699,8 +700,8 @@ RPATH_FLAGS=
 W_FLAGS=
 QCONFIG_FLAGS=
 XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++"
-XPLATFORM_MAC=no
-XPLATFORM_IOS=no
+XPLATFORM_MAC=no        # Whether target platform is OS X or iOS
+XPLATFORM_IOS=no        # Whether target platform is iOS
 XPLATFORM_ANDROID=no
 XPLATFORM_MINGW=no      # Whether target platform is MinGW (win32-g++*)
 XPLATFORM_QNX=no
@@ -2169,6 +2170,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}\""
@@ -2592,6 +2600,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
@@ -2853,15 +2869,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."
-        if [ -f "$relpath/LICENSE.LGPLv3" ]; then
+        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."
@@ -2870,7 +2891,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
@@ -2886,7 +2909,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
@@ -3147,9 +3170,12 @@ if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info"
 fi
 
+if [ "$XPLATFORM_MAC" = "yes" ]; then
+    [ "$CFG_PKGCONFIG" = "auto" ] && CFG_PKGCONFIG="no"
+fi
+
 if [ "$XPLATFORM_IOS" = "yes" ]; then
     CFG_RPATH="no"
-    CFG_PKGCONFIG="no"
     CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples"
     CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store
     CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples"
@@ -3195,6 +3221,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