diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:39 +0200 |
| commit | c3c943545eb7f084da314486524e8c9bb2fab431 (patch) | |
| tree | 6add1fea19fdec25af587e2f38c788c391501b7a /src | |
| parent | cf62652614676f58f9c45102a67a497c81805a36 (diff) | |
| parent | e443c7ba5552e5c88c331b370cc7a338d8672494 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 5 | ||||
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgdistancefieldutil_p.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index be0c70c80a..7ec92a8171 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1342,6 +1342,11 @@ void QQmlXMLHttpRequest::finished() if (redirect.isValid()) { QUrl url = m_network->url().resolved(redirect.toUrl()); if (url.scheme() != QLatin1String("file")) { + // See http://www.ietf.org/rfc/rfc2616.txt, section 10.3.4 "303 See Other": + // Result of 303 redirection should be a new "GET" request. + const QVariant code = m_network->attribute(QNetworkRequest::HttpStatusCodeAttribute); + if (code.isValid() && code.toInt() == 303 && m_method != QLatin1String("GET")) + m_method = QStringLiteral("GET"); destroyNetwork(); requestFromUrl(url); return; diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 3e9e988f28..e7284f870b 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2161,7 +2161,7 @@ void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeo goto geomChangeDone; if ((effectiveHAlign() != QQuickText::AlignLeft && widthChanged) - || vAlign() != QQuickText::AlignTop && heightChanged) { + || (vAlign() != QQuickText::AlignTop && heightChanged)) { // If the width has changed and we're not left aligned do an update so the text is // repositioned even if a full layout isn't required. And the same for vertical. d->updateType = QQuickTextPrivate::UpdatePaintNode; diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h index c9d4f3cb33..de3e778689 100644 --- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h +++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h @@ -75,7 +75,6 @@ private: QHash<QString, QSGDistanceFieldGlyphCache *> m_caches; - QSGGlyphNode::AntialiasingMode m_defaultAntialiasingMode; ThresholdFunc m_threshold_func; AntialiasingSpreadFunc m_antialiasingSpread_func; }; |