summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2022-03-12 01:48:07 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-14 00:50:20 +0000
commit8bb2d655ae85c92e1ded7a1b8dfae7bc264b61ae (patch)
tree2f81bb2410c89de0c1936282fe928a3935ead3d4 /src
parenta265c839f9ee2a6e7a764b0ad63b71675c1b892e (diff)
downloadqtbase-8bb2d655ae85c92e1ded7a1b8dfae7bc264b61ae.tar.gz
QCompleter: fix crash when setting the same model twice
Found when retesting the testcase completer.zip from QTBUG-54642 Change-Id: Id84eefeb3a33dc6d790cfa23755352381cc097a9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 7382e5735ea734fe5e5777518394963593603c32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/util/qcompleter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 85abcca0d7..727d1231aa 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -1120,6 +1120,8 @@ void QCompleter::setModel(QAbstractItemModel *model)
{
Q_D(QCompleter);
QAbstractItemModel *oldModel = d->proxy->sourceModel();
+ if (oldModel == model)
+ return;
#if QT_CONFIG(filesystemmodel)
if (qobject_cast<const QFileSystemModel *>(oldModel))
setCompletionRole(Qt::EditRole); // QTBUG-54642, clear FileNameRole set by QFileSystemModel