diff options
| author | Wang ChunLin <wangchunlin@uniontech.com> | 2020-09-22 14:57:26 +0800 |
|---|---|---|
| committer | Wang ChunLin <wangchunlin@uniontech.com> | 2020-09-25 10:52:27 +0800 |
| commit | 789d487cb0f4ef6f9d3e7c6ab5c5283dfe8dd350 (patch) | |
| tree | 605c1fff1c8737811bcbc75cb7c1e8ebf11bab27 /src/widgets | |
| parent | 75ca70288c3f3e68b90ff8516f6f306691780f17 (diff) | |
fix QComboBox currentText return placeholderText
If it does not add item,the currentText should return empty string
Fixes: QTBUG-86580
Pick-to: 5.15
Change-Id: I54c3a8b7ececfb1e62bcd7ac592feccaff3f8b48
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 77ef69fa25..a03de6e7f2 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2191,10 +2191,9 @@ QString QComboBox::currentText() const Q_D(const QComboBox); if (d->lineEdit) return d->lineEdit->text(); - else if (d->currentIndex.isValid()) + if (d->currentIndex.isValid()) return d->itemText(d->currentIndex); - else - return d->placeholderText; + return {}; } /*! |