path: root/tools
diff options
authorRichard Moore <>2012-01-03 14:08:03 +0000
committerQt by Nokia <>2012-01-06 11:19:23 +0100
commitb328e36e41dc0c529c897fe845c53be1d39424be (patch)
tree7a9e2dacda5a6ca7da6923425e793b50f908bc08 /tools
parentc25d147c4304ef85653f628259b2fa4846e1c29f (diff)
Add a new QT_NO_SSL feature macro.
At the moment users of Qt must detect if it was compiled with SSL support by testing for QT_NO_OPENSSL. This means that any code that is conditionally compiled this way is tied to the presence of the openssl backend. This commit makes it possible to implement new SSL backends during the Qt5 lifetime without breaking this code. People can still test for QT_NO_OPENSSL if they really need openssl, but if they simply want to know if there's SSL support at all they should use this define instead. In addition, this commit changes the public API headers to use the new define. Change-Id: Ib57a71aa65836ac9351f120a487bfeb8009d9515 Reviewed-by: Peter Hartmann <>
Diffstat (limited to 'tools')
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index c3ea048a18..bcc86cb697 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2915,7 +2915,10 @@ void Configure::generateConfigfiles()
if (dictionary["EXCEPTIONS"] == "no") qconfigList += "QT_NO_EXCEPTIONS";
if (dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL";
if (dictionary["OPENVG"] == "no") qconfigList += "QT_NO_OPENVG";
- if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL";
+ if (dictionary["OPENSSL"] == "no") {
+ qconfigList += "QT_NO_OPENSSL";
+ qconfigList += "QT_NO_SSL";
+ }
if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL";
if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS";
if (dictionary["WEBKIT"] == "no") qconfigList += "QT_NO_WEBKIT";