Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf

Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h
index e52ded5a18..2f16a4a54b 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;
             }
         }