diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
| commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
| tree | cf7281872045ebd57c68e10064ff0f400084aa13 /src/network/access/qhstspolicy.cpp | |
| parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
| parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'src/network/access/qhstspolicy.cpp')
| -rw-r--r-- | src/network/access/qhstspolicy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhstspolicy.cpp b/src/network/access/qhstspolicy.cpp index 0ea9f3f046..ab4695480b 100644 --- a/src/network/access/qhstspolicy.cpp +++ b/src/network/access/qhstspolicy.cpp @@ -103,11 +103,11 @@ QHstsPolicy::QHstsPolicy() : d(new QHstsPolicyPrivate) } /*! - Constructs QHstsPolicy with \a expiry (in UTC); \a includeSubDomains parameter - defines if this policy must also include subdomains, \a host data is interpreted - according to \a mode. + Constructs QHstsPolicy with \a expiry (in UTC): + - \a host data is interpreted according to \a mode; + - \a flags selects options to apply to this policy. - \sa QUrl::setHost(), QUrl::ParsingMode + \sa QUrl::setHost(), QUrl::ParsingMode, QHstsPolicy::PolicyFlag */ QHstsPolicy::QHstsPolicy(const QDateTime &expiry, PolicyFlags flags, const QString &host, QUrl::ParsingMode mode) |