diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-07 12:24:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-09 20:59:58 +0200 |
| commit | aef0aac581fbbead07be939873e34045137b94ff (patch) | |
| tree | 8c3ba5f67027a1c7fef1ce3e6bbfbc3379558af3 /src/qmlmodels | |
| parent | 03d039fcf255392d52b0fd4b6c47cedf546aa82f (diff) | |
Compile against latest qtbase
Adjust to the lastest changes in QList and QString.
Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlmodels')
| -rw-r--r-- | src/qmlmodels/qqmllistmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qmlmodels/qqmllistmodel.cpp b/src/qmlmodels/qqmllistmodel.cpp index d51b9c1c1e..39fdb1c582 100644 --- a/src/qmlmodels/qqmllistmodel.cpp +++ b/src/qmlmodels/qqmllistmodel.cpp @@ -284,7 +284,8 @@ void StringOrTranslation::setString(const QString &s) arrayData = dataPointer->d_ptr(); stringData = dataPointer->data(); stringSize = mutableString.length(); - arrayData->ref(); + if (arrayData) + arrayData->ref(); } void StringOrTranslation::setTranslation(const QV4::CompiledData::Binding *binding) |