diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-01-02 17:44:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-03 11:32:05 +0100 |
| commit | 1342f5da382532d75b381e0dd303cb57827a0d29 (patch) | |
| tree | 9dd2b02a03ace54c2befc06ccae901da9f617700 | |
| parent | 2f365ae7ec07878ed4c3148ab56cd8b1d222f0db (diff) | |
Move the Q_DECLARE_METATYPE for QList<QSslError> to qsslerror.h
Otherwise it is possible to assert if
qRegisterMetaType<QList<QSslError> >("QList<QSslError>")
is called in a TU which does not include the Q_DECLARE_METATYPE
invocation.
Change-Id: Ice1ffbb0f8d0a745d2bffc8b4e13ca31621e8ca4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | src/network/ssl/qsslerror.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index a222e2c58d..1acc5cb6e5 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -122,6 +122,10 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslError::SslError &erro QT_END_NAMESPACE +#ifndef QT_NO_SSL +Q_DECLARE_METATYPE(QList<QSslError>) +#endif + QT_END_HEADER #endif diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 306fb636a6..37f7c484f4 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -223,10 +223,6 @@ private: QT_END_NAMESPACE -#ifndef QT_NO_SSL -Q_DECLARE_METATYPE(QList<QSslError>) -#endif - QT_END_HEADER #endif |