From ccfd6872badaed768df14076dc46afcb2b3c861a Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 11 Jan 2019 20:18:23 +0100 Subject: QSqlRelationalDelegate: compile with QT_NO_CAST_FROM_BYTEARRAY 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 Reviewed-by: Andy Shaw --- src/sql/models/qsqlrelationaldelegate.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql/models') diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index e8ae5a229d..ca5c46778f 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -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; } } -- cgit v1.2.3