From 789d487cb0f4ef6f9d3e7c6ab5c5283dfe8dd350 Mon Sep 17 00:00:00 2001 From: Wang ChunLin Date: Tue, 22 Sep 2020 14:57:26 +0800 Subject: 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 --- src/widgets/widgets/qcombobox.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/widgets/widgets') 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 {}; } /*! -- cgit v1.2.3