diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-21 01:00:56 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-21 01:00:56 +0200 |
| commit | daa8040b5045dd282945bccef3a3f06c85595389 (patch) | |
| tree | 410a6707534b4328ea01279c6b3e23dcb09883cf /src/network | |
| parent | 5e9b2ade678f37e43bfc2e3484f54cbbb5844d2e (diff) | |
| parent | 84db112fe2c175a6e0351b5672b87f1425f30c3e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I642be6de9ef32491b09db97185146c671266240e
Diffstat (limited to 'src/network')
| -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 |