diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-03-21 20:42:50 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 02:02:07 +0200 |
| commit | dc6a1d186eb2060f549ef55b74711b54ed66ade7 (patch) | |
| tree | 56787f009fafc2e5c2ec5d434b45c82d568ffa2a /src/widgets/itemviews/qitemdelegate.cpp | |
| parent | c3e1abad4e141e6e9d876e5cff194c473a2654eb (diff) | |
Remove workaround for QComboBox not having a USER property.
QComboBox does in fact have a user property
since b1b87a73012342dc1619a8e907ea9954d59ca564.
Change-Id: I24eb2ef267cec5d8a9f7348954b703fa6df04fa5
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src/widgets/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 6c62378009..bd9f4510f7 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -551,13 +551,9 @@ void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) con Q_UNUSED(editor); Q_UNUSED(index); #else - Q_D(const QItemDelegate); QVariant v = index.data(Qt::EditRole); QByteArray n = editor->metaObject()->userProperty().name(); - // ### Qt 5: give QComboBox a USER property - if (n.isEmpty() && editor->inherits("QComboBox")) - n = d->editorFactory()->valuePropertyName(v.userType()); if (!n.isEmpty()) { if (!v.isValid()) v = QVariant(editor->property(n).userType(), (const void *)0); |