diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-10-25 12:37:30 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 09:16:41 +0100 |
commit | 142c5ef9ddd17e59d8d096ab065aee8cb50f5e8f (patch) | |
tree | 99df987fd2b259287d109f7f841c3943e0626130 /src/widgets/widgets/qlineedit_p.cpp | |
parent | e9c51a1fdc9092e5589fd6f823ad0e704e293c88 (diff) |
QLineEdit: Fix potential crash when removing the clear button.
Remove it from the side actions list.
Task-number: QTBUG-34315
Change-Id: I70063351193b504f8656e903896d155ac74f73a6
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.cpp')
-rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 99d6d0b8d9..c066f74c5a 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -445,10 +445,9 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE return w; } -void QLineEditPrivate::removeAction(const QActionEvent *e) +void QLineEditPrivate::removeAction(QAction *action) { Q_Q(QLineEdit); - QAction *action = e->action(); const PositionIndexPair positionIndex = findSideWidget(action); if (positionIndex.second == -1) return; |