From f41418aeb20ddc190892216a09feb564d2cef5b4 Mon Sep 17 00:00:00 2001
From: "Richard J. Moore" <rich@kde.org>
Date: Sun, 6 Apr 2014 15:56:08 +0100
Subject: Ensure we initialize things before checking the openssl version.

Task-number: QTBUG-37783
Change-Id: Ie276e597062d8bfc74ef57251ed21a94020e030f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/network/ssl/qsslsocket_openssl.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/network')

diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index bcb2254d11..1b3928fdfb 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -569,6 +569,9 @@ void QSslSocketPrivate::ensureInitialized()
 
 long QSslSocketPrivate::sslLibraryVersionNumber()
 {
+    if (!supportsSsl())
+        return 0;
+
     return q_SSLeay();
 }
 
-- 
cgit v1.2.3