diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-03 09:12:15 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-06-08 07:07:15 +0000 |
| commit | 95a4e5f016acf6421ea9a37f1d180d681d211221 (patch) | |
| tree | 896eda098c611a6b176cabaa4f10f640f0b107c7 /configure | |
| parent | bc9f8fd8de582c9a4f591e1ed194e1e9b65697fb (diff) | |
Set ssl in QT_CONFIG when openssl is enabled
Makes things symmetrical with the windows configure and cleans
up the logic in ssl.pri
Change-Id: I4a373afe78e904de7d04baea38c250ff0c9d5062
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5693,8 +5693,8 @@ fi [ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib" [ "$CFG_DBUS" != "no" ] && QT_CONFIG="$QT_CONFIG dbus" [ "$CFG_DBUS" = "linked" ] && QT_CONFIG="$QT_CONFIG dbus-linked" -[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl" -[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" +[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG ssl openssl" +[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG ssl openssl-linked" [ "$CFG_SECURETRANSPORT" = "yes" ] && QT_CONFIG="$QT_CONFIG ssl securetransport" [ "$CFG_LIBPROXY" = "yes" ] && QT_CONFIG="$QT_CONFIG libproxy" [ "$CFG_XCB" != "no" ] && QT_CONFIG="$QT_CONFIG xcb" |