summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-10 11:26:09 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-10 11:26:09 +0100
commit40cc6dea5b1b5d2570468adcc83943f8c8bd112e (patch)
treea314707e11905a9f8bab8d6a93d4532194af371a /Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp
parent0b30e4490f7500ade1868fb33cea8705418c90bb (diff)
parentc176f1fbe8ed0d87c507811f4c0e4d67a71bc890 (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts: .qmake.conf Change-Id: Id65b546f295897cd386125d2d3d4160051cc7d22
Diffstat (limited to 'Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp')
-rw-r--r--Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp
index 61ddacaa8..e6c83197e 100644
--- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp
+++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp
@@ -71,6 +71,9 @@ void QtFallbackWebPopup::show(const QWebSelectData& data)
m_combo->setGeometry(QRect(rect.left(), rect.top(), rect.width(), m_combo->sizeHint().height()));
}
+ // adjust the size of combo box to the longest name
+ m_combo->adjustSize();
+
m_combo->showPopupAtCursorPosition();
}