diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:41:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:44:53 +0200 |
| commit | 461a29be564271ef3a6ca1728f5e48ec2d25c08d (patch) | |
| tree | 27e9b0f90bc09e59fd31b2a5052e0c6f7327c467 /src/oauth/qoauthoobreplyhandler.cpp | |
| parent | 095d29d1afe10569ea3c2b4d834bc832b3ebaf9a (diff) | |
| parent | 3d93f6436596e349e43c3798b675af66db71df8a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/oauth/qabstractoauth.cpp
tests/auto/oauth1/tst_oauth1.cpp
Done-with: Jesus Fernandez<jesus.fernandez@qt.io>
Change-Id: I5be2c6ad2cd00943ee3acafe5b5c693fc4ada03c
Diffstat (limited to 'src/oauth/qoauthoobreplyhandler.cpp')
| -rw-r--r-- | src/oauth/qoauthoobreplyhandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/oauth/qoauthoobreplyhandler.cpp b/src/oauth/qoauthoobreplyhandler.cpp index 7201ff9..ff278f4 100644 --- a/src/oauth/qoauthoobreplyhandler.cpp +++ b/src/oauth/qoauthoobreplyhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Network Auth module of the Qt Toolkit. @@ -75,7 +75,8 @@ void QOAuthOobReplyHandler::networkReplyFinished(QNetworkReply *reply) if (contentType.startsWith(QStringLiteral("text/html")) || contentType.startsWith(QStringLiteral("application/x-www-form-urlencoded"))) { ret = parseResponse(data); - } else if (contentType.startsWith(QStringLiteral("application/json"))) { + } else if (contentType.startsWith(QStringLiteral("application/json")) + || contentType.startsWith(QStringLiteral("text/javascript"))) { const QJsonDocument document = QJsonDocument::fromJson(data); if (!document.isObject()) { qCWarning(lcReplyHandler, "Received data is not a JSON object: %s", |