diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-15 11:41:19 +0200 |
| commit | b669a429d0b2d4c58d47a6b3513d12ca57cf8fb6 (patch) | |
| tree | 0316635d6ebebb2f0fe3667016828d291af0c419 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | a8dd4f7d5b8f61b52a5aea7b8418a6a3961cae1e (diff) | |
| parent | 513363e940e0978931083544374bfe092107b9fb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/ButtonGroup.qml
tests/auto/controls/data/tst_container.qml
tests/auto/menu/tst_menu.cpp
Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index a6f9f6ca..dceda7d7 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -204,6 +204,10 @@ QString QQuickComboBoxDelegateModel::stringValue(int index, const QString &role) if (data.count() == 1 && role == QLatin1String("modelData")) return data.first().toString(); return data.value(role).toString(); + } else if (object.userType() == QMetaType::QObjectStar) { + const QObject *data = object.value<QObject *>(); + if (data && role != QLatin1String("modelData")) + return data->property(role.toUtf8()).toString(); } } return QQmlDelegateModel::stringValue(index, role); |