diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:17:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-28 16:17:05 +0200 |
| commit | 1c9bf2e4641ba1fe8e6d8ba3da0d783e11ae56f6 (patch) | |
| tree | 7acb42c1c65868a3befa256cf117b6cacb942546 /src/controls/qquickpopupwindow.cpp | |
| parent | 10f0da6cfb56396a16ec741380556320fba86552 (diff) | |
| parent | 042cd5a6d88685d57e8828e4aca55e48feeb9bf7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/qquickpopupwindow.cpp')
| -rw-r--r-- | src/controls/qquickpopupwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/controls/qquickpopupwindow.cpp b/src/controls/qquickpopupwindow.cpp index 56f4c351a..bcd2837fd 100644 --- a/src/controls/qquickpopupwindow.cpp +++ b/src/controls/qquickpopupwindow.cpp @@ -143,8 +143,7 @@ void QQuickPopupWindow::setPopupContentItem(QQuickItem *contentItem) void QQuickPopupWindow::updateSize() { - QSize contentSize = popupContentItem()->childrenRect().size().toSize(); - setGeometry(x(), y(), contentSize.width(), contentSize.height()); + setGeometry(x(), y(), popupContentItem()->width(), popupContentItem()->height()); emit geometryChanged(); } |