Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	configure
	src/plugins/platforms/eglfs/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp

Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b

1 files changed, 3 insertions, 3 deletions

diff --git a/configure b/configure
index ba94d08714..31c073246e 100755
--- a/configure
+++ b/configure
@@ -3125,14 +3125,14 @@ if [ "$Edition" = "OpenSource" ]; then
     while true; do
         if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then
             echo "You are licensed to use this software under the terms of"
-            echo "the GNU Lesser General Public License (LGPL) versions 3."
+            echo "the GNU Lesser General Public License (LGPL) version 3."
             echo "You are also licensed to use this software under the terms of"
-            echo "the GNU General Public License (GPL) versions 2."
+            echo "the GNU General Public License (GPL) version 2."
             affix="either"
             showGPL2="yes"
         else
             echo "You are licensed to use this software under the terms of"
-            echo "the GNU Lesser General Public License (LGPL) versions 3."
+            echo "the GNU Lesser General Public License (LGPL) version 3."
             showGPL2="no"
             affix="the"
         fi