diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-07-26 01:10:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-26 23:08:04 +0200 |
| commit | f408dfd0337ecee503e5753b5a8c2bf1a8a05db2 (patch) | |
| tree | 946323c01cd7636739abc7673c92a20bb0f77519 /src/network | |
| parent | 51742cd332939d389b02c09bec8a503d6e9467a9 (diff) | |
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>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 9 | ||||
| -rw-r--r-- | src/network/ssl/qsslconfiguration.h | 9 |
2 files changed, 8 insertions, 10 deletions
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 |