4 files changed, 9 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index b9517ee7c..8ec5d1fe7 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -106,7 +106,7 @@ QString QQuickWebEngineScript::toString() const
 }
 
 /*!
-    \qmlproperty QString WebEngineScript::name
+    \qmlproperty string WebEngineScript::name
 
     The name of the script. Can be useful to retrieve a particular script from
     \l{WebEngineView::userScripts}{WebEngineView.userScripts}.
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 87b0b0422..7aa4d2a96 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -99,7 +99,7 @@ bool QQuickWebEngineSettings::javascriptEnabled() const
 /*!
     \qmlproperty bool WebEngineSettings::javascriptCanOpenWindows
 
-    Allows JavaScript programs to open new windows.
+    Allows JavaScript programs to open popup windows without user interaction.
 
     Enabled by default.
 */
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 4acf3eb55..82fd66989 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -346,21 +346,21 @@
 */
 
 /*!
-    \qmlproperty QSizeF WebEngineView::contentsSize
+    \qmlproperty size WebEngineView::contentsSize
     \since QtWebEngine 1.3
 
     Size of the page contents.
 */
 
 /*!
-    \qmlproperty QPointF WebEngineView::scrollPosition
+    \qmlproperty point WebEngineView::scrollPosition
     \since QtWebEngine 1.3
 
     Scroll position of the page contents.
 */
 
 /*!
-    \qmlproperty uint WebEngineView::webChannelWorld
+    \qmlproperty int WebEngineView::webChannelWorld
     \since QtWebEngine 1.3
 
     JavaScript world that the web channel instance used by this view is
@@ -804,7 +804,7 @@
            (Added in Qt 5.6)
     \value  WebEngineView.ExitFullScreen
             Exit the fullscreen mode. (Added in Qt 5.6)
-    \value  SavePage
+    \value  WebEngineView.SavePage
             Save the current web page to disk. (Added in Qt 5.7)
 
     \omitvalue WebActionCount
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index e9b8dea44..68b097d4a 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -265,7 +265,7 @@ void RenderWidgetHostViewQtDelegateQuick::mousePressEvent(QMouseEvent *event)
     QQuickItem *parent = parentItem();
     if (!m_isPopup && (parent && parent->property("activeFocusOnPress").toBool()))
         forceActiveFocus();
-    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+    if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
         event->ignore();
         return;
     }
@@ -285,7 +285,7 @@ void RenderWidgetHostViewQtDelegateQuick::mouseMoveEvent(QMouseEvent *event)
 void RenderWidgetHostViewQtDelegateQuick::mouseReleaseEvent(QMouseEvent *event)
 {
     QQuickItem *parent = parentItem();
-    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+    if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
         event->ignore();
         return;
     }
@@ -323,7 +323,7 @@ void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event)
 void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
 {
     QQuickItem *parent = parentItem();
-    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+    if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
         event->ignore();
         return;
     }