diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-07 00:44:44 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-07 00:44:48 (GMT) |
| commit | 20998cb0c2a531977a39e63c1743b593ecdc1796 (patch) | |
| tree | 0f97d36beb9364943358a7930c6a325cbca87905 | |
| parent | 6d908473ec1a8c72f4bbb9d772e801024c3a62a0 (diff) | |
| parent | 91443717927ee648a0c1c4185aae171ccdf87e2b (diff) | |
| download | Qt-20998cb0c2a531977a39e63c1743b593ecdc1796.zip Qt-20998cb0c2a531977a39e63c1743b593ecdc1796.tar.gz Qt-20998cb0c2a531977a39e63c1743b593ecdc1796.tar.bz2 | |
Merge branch '4.5' into 4.6
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3874,7 +3874,7 @@ elif [ "$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 [ -e "$relpath/LICENSE.GPL3" ]; then + if [ -f "$relpath/LICENSE.GPL3" ]; then echo "You are also licensed to use this software under the terms of" echo "the GNU General Public License (GPL) versions 3." affix="either" @@ -3886,7 +3886,7 @@ elif [ "$Edition" = "OpenSource" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - if [ -e "$relpath/LICENSE.GPL3" ]; then + if [ -f "$relpath/LICENSE.GPL3" ]; then echo "Type '3' to view the GNU General Public License version 3." fi echo "Type 'L' to view the Lesser GNU General Public License version 2.1." |