summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/network/kernel/qauthenticator.cpp2
-rw-r--r--src/widgets/widgets/qfocusframe.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index e9a8e2a9e5..c95b1280b0 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -531,6 +531,7 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
response = qNtlmPhase3(this, QByteArray::fromBase64(challenge)).toBase64();
phase = Done;
}
+ challenge = "";
}
break;
@@ -560,6 +561,7 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet
if (!phase3Token.isEmpty()) {
response = phase3Token.toBase64();
phase = Done;
+ challenge = "";
}
}
diff --git a/src/widgets/widgets/qfocusframe.cpp b/src/widgets/widgets/qfocusframe.cpp
index 4e793d7a29..aa9de7c35f 100644
--- a/src/widgets/widgets/qfocusframe.cpp
+++ b/src/widgets/widgets/qfocusframe.cpp
@@ -99,6 +99,8 @@ void QFocusFramePrivate::updateSize()
return;
q->setGeometry(geom);
+
+ opt.rect = q->rect();
QStyleHintReturnMask mask;
if (q->style()->styleHint(QStyle::SH_FocusFrame_Mask, &opt, q, &mask))
q->setMask(mask.region);