diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
| commit | ec686af14f817cc51323cfb01186f036905789c3 (patch) | |
| tree | 29d229c8df8f37db56b9f6f5f3997bcd732689d4 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 0425562e14e41b62dc7631c7c02768b8294454d0 (diff) | |
| parent | 090eab86b05478572485b3086c087a846fbae7fd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_combobox.qml
Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index cc2f4358..7a7e00b1 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -2699,10 +2699,10 @@ QString QQuickPopup::accessibleName() const return d->popupItem->accessibleName(); } -void QQuickPopup::setAccessibleName(const QString &name) +void QQuickPopup::maybeSetAccessibleName(const QString &name) { Q_D(QQuickPopup); - d->popupItem->setAccessibleName(name); + d->popupItem->maybeSetAccessibleName(name); } QVariant QQuickPopup::accessibleProperty(const char *propertyName) |