diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-16 12:26:36 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-16 13:54:01 +0000 |
commit | b39adf8945616dfc02df7177dccef6b051a1903b (patch) | |
tree | 21a91178abc484b8cf191eec461f80678a107b33 /configure | |
parent | 38e935701c0faeb19b9b1493dc2d6d60c6bc3ca3 (diff) | |
parent | 90c425642dfeae4564b43dacf15f80479962e910 (diff) |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1104,14 +1104,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 |