diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 09:59:28 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-01 09:59:28 +0000 |
| commit | 0698f876ca02b85c1e584b72cac3444796f6a355 (patch) | |
| tree | 022748fb34278fb455d8e029d912dfb0b545f443 /configure | |
| parent | cd297f99a2ce9c53c3ac4633bdf2425af364a1bc (diff) | |
| parent | 0aa2d318b1524cdab42ab9988270779ddcc1922a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -2697,6 +2697,8 @@ MacOS/iOS options: link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. + -secure-transport .. Use SecureTransport instead of OpenSSL (requires -no-openssl) + -sdk <sdk> ......... Build Qt using Apple provided SDK <sdk>. The argument should be one of the available SDKs as listed by 'xcodebuild -showsdks'. Note that the argument applies only to Qt libraries and applications built @@ -2963,11 +2965,21 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; EditionString="Technology Preview" elif [ $COMMERCIAL_USER = "yes" ]; then if [ $UNAME_SYSTEM = "Linux" ]; then - if file -L /bin/sh | grep -q "64-bit" ; then - Licheck=licheck64 - else + case "$PLATFORM" in + *-32) Licheck=licheck32 - fi + ;; + *-64) + Licheck=licheck64 + ;; + *) + if file -L /bin/sh | grep -q "64-bit" ; then + Licheck=licheck64 + else + Licheck=licheck32 + fi + ;; + esac elif [ $UNAME_SYSTEM = "Darwin" ]; then Licheck=licheck_mac else |