AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSqlRelationalDelegate: compile with QT_NO_CAST_FROM_BYTEARRAY

Browse Source 
QSqlRelationalDelegate::setEditorData() does not compile when
QT_NO_CAST_FROM_BYTEARRAY is defined. Since it's a public header this
will break user code.
Fix it by calling QByteArray::data() instead of relying on the
implicit cast.

Fixes: QTBUG-72764
Change-Id: I9c111dd25f48c9c9780d9f9a5b6b75eed0c8d6ed
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-01-11 20:18:23 +01:00
parent a53500f5bf
commit ccfd6872ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/models/qsqlrelationaldelegate.h
View File

@ -109,11 +109,11 @@ QWidget *createEditor(QWidget *aParent,
// to present the DisplayRole and not the EditRole which
// is the id reference to the related model
QVariant v = index.data(Qt::DisplayRole);
QByteArray n = editor->metaObject()->userProperty().name();
const QByteArray n = editor->metaObject()->userProperty().name();
if (!n.isEmpty()) {
if (!v.isValid())
v = QVariant(editor->property(n).userType(), nullptr);
editor->setProperty(n, v);
v = QVariant(editor->property(n.data()).userType(), nullptr);
editor->setProperty(n.data(), v);
return;
}
}