From f408dfd0337ecee503e5753b5a8c2bf1a8a05db2 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 26 Jul 2012 01:10:50 +0200
Subject: QtNetwork: unbreak QT_NO_SSL build

The Q_DECLARE_METATYPE()s were outside of #ifndef QT_NO_SSL for classes
that are defined inside.

Expand the #ifndef block.

Change-Id: I45b73a24032fb2a79fd80d91282b782daa8a8f68
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
---
 src/network/ssl/qsslcertificate.h   | 9 ++++-----
 src/network/ssl/qsslconfiguration.h | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/network/ssl')

diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 08df58bae8..4b8a211aa8 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -54,11 +54,10 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-
 #ifndef QT_NO_SSL
 
+QT_BEGIN_NAMESPACE
+
 class QDateTime;
 class QIODevice;
 class QSslError;
@@ -154,12 +153,12 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCertificate &certific
 Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QSslCertificate::SubjectInfo info);
 #endif
 
-#endif // QT_NO_SSL
-
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QSslCertificate)
 
+#endif // QT_NO_SSL
+
 QT_END_HEADER
 
 #endif
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index dea32f837c..ebfd57ff23 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -63,11 +63,10 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-
 #ifndef QT_NO_SSL
 
+QT_BEGIN_NAMESPACE
+
 template<typename T> class QList;
 class QSslCertificate;
 class QSslCipher;
@@ -134,12 +133,12 @@ private:
     QSharedDataPointer<QSslConfigurationPrivate> d;
 };
 
-#endif  // QT_NO_SSL
-
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QSslConfiguration)
 
+#endif  // QT_NO_SSL
+
 QT_END_HEADER
 
 #endif
-- 
cgit v1.2.3