Fix at lot of QT_NO_ define guards for very tiny Qt builds.

Change-Id: If33639be245a1ad3782e1fde279371f330a988be
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

8 files changed, 48 insertions, 0 deletions

diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index a015880900..83484e3699 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -107,6 +107,10 @@
     \value StateOrProvinceName "ST" The state or province.
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslcertificate.h"
 #include "qsslcertificate_p.h"
@@ -883,3 +887,5 @@ QDebug operator<<(QDebug debug, QSslCertificate::SubjectInfo info)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index f7150c95e7..bf08dca163 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -58,6 +58,10 @@
     \sa QSslSocket, QSslKey
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslcipher.h"
 #include "qsslcipher_p.h"
 #include "qsslsocket.h"
@@ -236,3 +240,5 @@ QDebug operator<<(QDebug debug, const QSslCipher &cipher)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index f37223ae55..5f522d1de3 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslconfiguration.h"
 #include "qsslconfiguration_p.h"
 #include "qsslsocket.h"
@@ -572,3 +576,5 @@ void QSslConfiguration::setDefaultConfiguration(const QSslConfiguration &configu
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 8f8506a1c0..b709aaa95b 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -91,6 +91,10 @@
     \sa QSslError::errorString()
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslerror.h"
 #include "qsslsocket.h"
 #ifndef QT_NO_DEBUG_STREAM
@@ -319,3 +323,5 @@ QDebug operator<<(QDebug debug, const QSslError::SslError &error)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index 7e4c37383a..3f41406177 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -55,6 +55,10 @@
     \sa QSslSocket, QSslCertificate, QSslCipher
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslkey.h"
 #include "qsslkey_p.h"
@@ -458,3 +462,5 @@ QDebug operator<<(QDebug debug, const QSslKey &key)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index cc956b6382..2dd35aad38 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -298,6 +298,10 @@
     \sa peerVerifyError()
 */
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslcipher.h"
 #include "qsslsocket.h"
 #include "qsslsocket_openssl_p.h"
@@ -2334,3 +2338,5 @@ QT_END_NAMESPACE
 // For private slots
 #define d d_ptr
 #include "moc_qsslsocket.cpp"
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 367d07e6fd..0ea174e3be 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -42,6 +42,10 @@
 //#define QSSLSOCKET_DEBUG
 //#define QT_DECRYPT_SSL_TRAFFIC
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_p.h"
 #include "qsslsocket_openssl_symbols_p.h"
 #include "qsslsocket.h"
@@ -1546,3 +1550,5 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_OPENSSL
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 96054b266f..e902dce7c9 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -40,6 +40,10 @@
 ****************************************************************************/
 
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_OPENSSL
+
 #include "qsslsocket_openssl_symbols_p.h"
 
 #ifdef Q_OS_WIN
@@ -984,3 +988,5 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime)
 }
 
 QT_END_NAMESPACE
+
+#endif QT_NO_OPENSSL