1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.14' into 5.15

Browse Source 
This reverts commit 3a6d8df5219653b043bd642668cee193f563ec84.

That change is only for 5.14.

 Conflicts:
	src/plugins/platforms/wasm/qwasmeventtranslator.cpp
	src/plugins/platforms/wasm/qwasmintegration.cpp
	src/plugins/platforms/wasm/qwasmopenglcontext.cpp
	src/plugins/platforms/wasm/qwasmscreen.cpp

Change-Id: Ib9151e199291fe6eb4151027b515393c05303d65
This commit is contained in:
Liang Qi 2020-04-21 21:16:23 +02:00
commit 70a5ff0997
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/kernel/qauthenticator.cpp
View File

@ -531,6 +531,7 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
response = qNtlmPhase3(this, QByteArray::fromBase64(challenge)).toBase64(); response = qNtlmPhase3(this, QByteArray::fromBase64(challenge)).toBase64();
phase = Done; phase = Done;
} }
challenge = "";
} }
break; break;
@ -560,6 +561,7 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
if (!phase3Token.isEmpty()) { if (!phase3Token.isEmpty()) {
response = phase3Token.toBase64(); response = phase3Token.toBase64();
phase = Done; phase = Done;
challenge = "";
} }
} }

2
src/widgets/widgets/qfocusframe.cpp
View File

@ -99,6 +99,8 @@ void QFocusFramePrivate::updateSize()
return; return;
q->setGeometry(geom); q->setGeometry(geom);
opt.rect = q->rect();
QStyleHintReturnMask mask; QStyleHintReturnMask mask;
if (q->style()->styleHint(QStyle::SH_FocusFrame_Mask, &opt, q, &mask)) if (q->style()->styleHint(QStyle::SH_FocusFrame_Mask, &opt, q, &mask))
q->setMask(mask.region); q->setMask(mask.region);