AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtNetwork: unbreak QT_NO_SSL build

Browse Source 
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>
This commit is contained in:
Marc Mutz 2012-07-26 01:10:50 +02:00 committed by Qt by Nokia
parent 51742cd332
commit f408dfd033
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/ssl/qsslcertificate.h
View File

@ -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

9
src/network/ssl/qsslconfiguration.h
View File

@ -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