diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:41:27 +0100 |
| commit | c808dd27459e030fde0577feb8ba06e3bd465526 (patch) | |
| tree | 4bf898dc4a88e2b03c9716f940638a2e01c6c0ce /src/sql | |
| parent | d9d8845d507a6bdbc9c9f24c0d9d86dca513461d (diff) | |
| parent | 300534fc214f2547a63594ce0891e9a54c8f33ca (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs
Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsql.qdoc | 1 | ||||
| -rw-r--r-- | src/sql/models/qsqlrelationaldelegate.h | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/sql/kernel/qsql.qdoc b/src/sql/kernel/qsql.qdoc index 3b0e848af1..b3afe82245 100644 --- a/src/sql/kernel/qsql.qdoc +++ b/src/sql/kernel/qsql.qdoc @@ -31,7 +31,6 @@ \brief The QSql namespace contains miscellaneous identifiers used throughout the Qt SQL library. - \inheaderfile QtSql \ingroup database diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index 439dde2662..52a19dbb0a 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -82,17 +82,6 @@ QWidget *createEditor(QWidget *aParent, return combo; } -void setEditorData(QWidget *editor, const QModelIndex &index) const -{ - const QSqlRelationalTableModel *sqlModel = qobject_cast<const QSqlRelationalTableModel *>(index.model()); - QComboBox *combo = qobject_cast<QComboBox *>(editor); - if (!sqlModel || !combo) { - QItemDelegate::setEditorData(editor, index); - return; - } - combo->setCurrentIndex(combo->findText(sqlModel->data(index).toString())); -} - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { if (!index.isValid()) |