diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 09:06:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-02-17 10:36:32 +0000 |
| commit | e5c3700a61c03e674544e51a063de80338f8a7b0 (patch) | |
| tree | b7c0860f3c83358b2bea03e7915fd98d09db7c02 /src/network | |
| parent | a81dfb32d6f9e7a407567511c20b59e537f6a063 (diff) | |
| parent | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 2ad46918b2..bbcd191041 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -252,6 +252,10 @@ QT_BEGIN_NAMESPACE QNetworkSession::QNetworkSession(const QNetworkConfiguration &connectionConfig, QObject *parent) : QObject(parent), d(0) { + qRegisterMetaType<QNetworkSession::State>(); + qRegisterMetaType<QNetworkSession::SessionError>(); + qRegisterMetaType<QNetworkSession::UsagePolicies>(); + // invalid configuration if (!connectionConfig.identifier().isEmpty()) { const auto engines = qNetworkConfigurationManagerPrivate()->engines(); @@ -277,10 +281,6 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration &connectionConfig, } } } - - qRegisterMetaType<QNetworkSession::State>(); - qRegisterMetaType<QNetworkSession::SessionError>(); - qRegisterMetaType<QNetworkSession::UsagePolicies>(); } /*! |