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>
bb10
Stephen Kelly 2013-01-02 17:44:17 +01:00 committed by The Qt Project
parent 2f365ae7ec
commit 1342f5da38
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -223,10 +223,6 @@ private:
QT_END_NAMESPACE
#ifndef QT_NO_SSL
Q_DECLARE_METATYPE(QList<QSslError>)
#endif
QT_END_HEADER
#endif