diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-31 14:12:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-16 05:08:13 +0100 |
| commit | f6265182add2b6163069bbcee7f8bfffc7013158 (patch) | |
| tree | 2d5d7bf377e0e432887d589d5509e3183e0453e1 /configure | |
| parent | cd9c98e8813600a6633c9d8b4deb00ae9560bfc5 (diff) | |
configure: Remove duplicated logic for dealing with framework builds
The exact same hunk is present 100 lines below.
Change-Id: Ia3d61037b29186368e30f95f4162282d38bca972
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -2623,20 +2623,6 @@ else MAC_SDK_FLAG= fi -# find the default framework value -if [ "$BUILD_ON_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "auto" ]; then - CFG_FRAMEWORK="$CFG_SHARED" - elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then - echo - echo "WARNING: Using static linking will disable the use of Mac frameworks." - echo - CFG_FRAMEWORK="no" - fi -else - CFG_FRAMEWORK=no -fi - # disable GTK style support auto-detection on Mac if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then CFG_QGTKSTYLE=no |