diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-05 17:58:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-05 18:02:18 +0100 |
| commit | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch) | |
| tree | c58ac922346363c265ad6873cefe9ed205d84a1d /src/network/access/qhttpmultipart.cpp | |
| parent | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff) | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/global/minimum-linux.S
src/network/access/qhttpthreaddelegate.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/network/access/qhttpmultipart.cpp')
| -rw-r--r-- | src/network/access/qhttpmultipart.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp index 58d306d5f9..c59df9d8b8 100644 --- a/src/network/access/qhttpmultipart.cpp +++ b/src/network/access/qhttpmultipart.cpp @@ -435,7 +435,7 @@ QHttpMultiPartPrivate::QHttpMultiPartPrivate() : contentType(QHttpMultiPart::Mix { // 24 random bytes, becomes 32 characters when encoded to Base64 quint32 random[6]; - QRandomGenerator::fillRange(random); + QRandomGenerator::global()->fillRange(random); boundary = "boundary_.oOo._" + QByteArray::fromRawData(reinterpret_cast<char *>(random), sizeof(random)).toBase64(); |