diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-03-03 17:00:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 10:31:34 +0100 |
| commit | 204eaf0c491a29681dad87751f93e3079e08f0b4 (patch) | |
| tree | 4bdf2b544f9e72489aa0ce2a74c3c91cfbdb861d /Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp | |
| parent | dddf2c7d66ed7169ab03e0469b6ffec400e00050 (diff) | |
| download | qtwebkit-204eaf0c491a29681dad87751f93e3079e08f0b4.tar.gz | |
Avoid deleting QtWebComboBox it's own nested QEventLoop
A race condition meant that sometimes a QtWebComboBox would be deleted
in an eventloop run while hiding itself. This patch adds a flags
and delays scheduling a deletion until after the nested eventloop.
Task-number: QTBUG-29844
Change-Id: Ia5e03954756afa29c0be0a2d7f49ae8d1dbba250
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp')
| -rw-r--r-- | Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp index 5bf90d800..61ddacaa8 100644 --- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp +++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp @@ -128,7 +128,7 @@ void QtFallbackWebPopup::deleteComboBox() { if (!m_combo) return; - m_combo->deleteLater(); + m_combo->deleteComboBox(); m_combo = 0; } |