diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 17:18:04 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 17:18:04 (GMT) |
| commit | 57b3d45dff62e0f23508601caf2560edd3dee33b (patch) | |
| tree | 19cc94e225f18e6309030402964db4ee85d9d945 /configure | |
| parent | d21fc5446c7583e153c1d566aefd7186f9c445cd (diff) | |
| parent | 491bf41b96fdc48aa166ae7702e00f3e6eb1825c (diff) | |
| download | Qt-57b3d45dff62e0f23508601caf2560edd3dee33b.zip Qt-57b3d45dff62e0f23508601caf2560edd3dee33b.tar.gz Qt-57b3d45dff62e0f23508601caf2560edd3dee33b.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
examples/qws/dbscreen/dbscreen.cpp
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3855,8 +3855,9 @@ elif [ "$Edition" = "OpenSource" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - test -e "$relpath/LICENSE.GPL3" && \ + if [ -e "$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." echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." |