Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I9253c87c3bd54204401070f492c7590166be0fe3

1 files changed, 2 insertions, 3 deletions

diff --git a/src/controls/qquickmenupopupwindow.cpp b/src/controls/qquickmenupopupwindow.cpp
index 24dfcaaf..e730847c 100644
--- a/src/controls/qquickmenupopupwindow.cpp
+++ b/src/controls/qquickmenupopupwindow.cpp
@@ -118,12 +118,11 @@ void QQuickMenuPopupWindow::setGeometry(int posx, int posy, int w, int h)
 
 void QQuickMenuPopupWindow::updateSize()
 {
-    QSize contentSize = popupContentItem()->childrenRect().size().toSize();
     qreal x = m_initialPos.x();
     qreal y = m_initialPos.y();
     if (qGuiApp->layoutDirection() == Qt::RightToLeft)
-        x -= contentSize.width();
-    setGeometry(x, y, contentSize.width(), contentSize.height());
+        x -= popupContentItem()->width();
+    setGeometry(x, y, popupContentItem()->width(), popupContentItem()->height());
 }
 
 void QQuickMenuPopupWindow::updatePosition()