From 95a4e5f016acf6421ea9a37f1d180d681d211221 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 3 Jun 2016 09:12:15 +0200
Subject: [PATCH] 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>
---
 configure               |  4 +--
 src/network/ssl/ssl.pri | 58 ++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/configure b/configure
index 1496925a41..a908a199b1 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 803d70a257..edbbeadf51 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -1,5 +1,5 @@
 # OpenSSL support; compile in QSslSocket.
-contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+contains(QT_CONFIG, ssl) {
     HEADERS += ssl/qasn1element_p.h \
                ssl/qssl.h \
                ssl/qssl_p.h \
@@ -55,38 +55,38 @@ contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, op
                    ssl/qsslsocket_mac.cpp \
                    ssl/qsslellipticcurve_dummy.cpp
     }
-}
 
-contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-    HEADERS += ssl/qsslcontext_openssl_p.h \
-               ssl/qsslsocket_openssl_p.h \
-               ssl/qsslsocket_openssl_symbols_p.h
-    SOURCES += ssl/qsslcertificate_openssl.cpp \
-               ssl/qsslcontext_openssl.cpp \
-               ssl/qssldiffiehellmanparameters_openssl.cpp \
-               ssl/qsslellipticcurve_openssl.cpp \
-               ssl/qsslkey_openssl.cpp \
-               ssl/qsslsocket_openssl.cpp \
-               ssl/qsslsocket_openssl_symbols.cpp
+    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+        HEADERS += ssl/qsslcontext_openssl_p.h \
+                   ssl/qsslsocket_openssl_p.h \
+                   ssl/qsslsocket_openssl_symbols_p.h
+        SOURCES += ssl/qsslcertificate_openssl.cpp \
+                   ssl/qsslcontext_openssl.cpp \
+                   ssl/qssldiffiehellmanparameters_openssl.cpp \
+                   ssl/qsslellipticcurve_openssl.cpp \
+                   ssl/qsslkey_openssl.cpp \
+                   ssl/qsslsocket_openssl.cpp \
+                   ssl/qsslsocket_openssl_symbols.cpp
 
-    darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp
+        darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp
 
-    android: SOURCES += ssl/qsslsocket_openssl_android.cpp
+        android: SOURCES += ssl/qsslsocket_openssl_android.cpp
 
-    # Add optional SSL libs
-    # Static linking of OpenSSL with msvc:
-    #   - Binaries http://slproweb.com/products/Win32OpenSSL.html
-    #   - also needs -lUser32 -lAdvapi32 -lGdi32 -lCrypt32
-    #   - libs in <OPENSSL_DIR>\lib\VC\static
-    #   - configure: -openssl -openssl-linked -I <OPENSSL_DIR>\include -L <OPENSSL_DIR>\lib\VC\static OPENSSL_LIBS="-lUser32 -lAdvapi32 -lGdi32" OPENSSL_LIBS_DEBUG="-lssleay32MDd -llibeay32MDd" OPENSSL_LIBS_RELEASE="-lssleay32MD -llibeay32MD"
+        # Add optional SSL libs
+        # Static linking of OpenSSL with msvc:
+        #   - Binaries http://slproweb.com/products/Win32OpenSSL.html
+        #   - also needs -lUser32 -lAdvapi32 -lGdi32 -lCrypt32
+        #   - libs in <OPENSSL_DIR>\lib\VC\static
+        #   - configure: -openssl -openssl-linked -I <OPENSSL_DIR>\include -L <OPENSSL_DIR>\lib\VC\static OPENSSL_LIBS="-lUser32 -lAdvapi32 -lGdi32" OPENSSL_LIBS_DEBUG="-lssleay32MDd -llibeay32MDd" OPENSSL_LIBS_RELEASE="-lssleay32MD -llibeay32MD"
 
-    CONFIG(debug, debug|release) {
-        LIBS_PRIVATE += $$OPENSSL_LIBS_DEBUG
-    } else {
-        LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
+        CONFIG(debug, debug|release) {
+            LIBS_PRIVATE += $$OPENSSL_LIBS_DEBUG
+        } else {
+            LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
+        }
+
+        QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
+        LIBS_PRIVATE += $$OPENSSL_LIBS
+        win32: LIBS_PRIVATE += -lcrypt32
     }
-
-    QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
-    LIBS_PRIVATE += $$OPENSSL_LIBS
-    win32: LIBS_PRIVATE += -lcrypt32
 }