diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:00:45 +0200 |
| commit | 84db112fe2c175a6e0351b5672b87f1425f30c3e (patch) | |
| tree | 9a15f7f8e6ec03483c6580ae628f916fe4bd0568 /src/network/ssl | |
| parent | 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (diff) | |
| parent | ff2ba8b9d2798c4b7a77734df723d6312b983f1d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I69f44ea7254cb2643a00b040bbb46f41b7f76a87
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslerror.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index c4a0d52193..28eb1a9ea8 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE class QSslErrorPrivate; class Q_NETWORK_EXPORT QSslError { + Q_GADGET public: enum SslError { NoError, @@ -94,6 +95,7 @@ public: OcspStatusUnknown, UnspecifiedError = -1 }; + Q_ENUM(SslError) // RVCT compiler in debug build does not like about default values in const- // So as an workaround we define all constructor overloads here explicitly |