diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-25 15:45:22 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-27 11:27:53 +0200 |
| commit | 30ec6d65845938c14f14f543309160d445da700d (patch) | |
| tree | 0709daf648dac8cb63cddf3b1bf689dfde049908 /src/webengine/api | |
| parent | 7013cd858c1f2c84ad0e178f68c6cbfb6aed2530 (diff) | |
| parent | d96f8495b59878f50223a81a734ce0983539d8cf (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibc1c881a67bf088ba6fb044e2553c74c7e9e24ca
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 8 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 5e5d91012..e11147760 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -139,6 +139,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() , m_fullscreenMode(false) , isLoading(false) , m_activeFocusOnPress(true) + , m_validationShowing(false) , devicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()) , m_webChannel(0) , m_webChannelWorld(0) @@ -1132,7 +1133,8 @@ void QQuickWebEngineViewPrivate::showValidationMessage(const QRect &anchor, cons Q_Q(QQuickWebEngineView); QQuickWebEngineFormValidationMessageRequest *request; request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Show, - anchor,mainText,subText); + anchor,mainText,subText); + m_validationShowing = true; // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(request); Q_EMIT q->formValidationMessageRequested(request); @@ -1143,8 +1145,12 @@ void QQuickWebEngineViewPrivate::showValidationMessage(const QRect &anchor, cons void QQuickWebEngineViewPrivate::hideValidationMessage() { Q_Q(QQuickWebEngineView); + // Suppress the initial hide message before any show messages (Since 61-based) + if (!m_validationShowing) + return; QQuickWebEngineFormValidationMessageRequest *request; request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Hide); + m_validationShowing = false; // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(request); Q_EMIT q->formValidationMessageRequested(request); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index b50a524ef..708725787 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -180,6 +180,7 @@ public: bool isLoading; bool m_activeFocusOnPress; bool m_navigationActionTriggered; + bool m_validationShowing; qreal devicePixelRatio; QMap<quint64, QJSValue> m_callbacks; QList<QSharedPointer<CertificateErrorController> > m_certificateErrorControllers; |