diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2020-06-11 00:20:13 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-11 11:18:21 +0200 |
| commit | 11a09e212877988d37416842ad73d9aa357ba51f (patch) | |
| tree | 609ad9c60b6e18432f76b4ad8c1fcd8759578477 /src/quick/items/qquicktextnodeengine.cpp | |
| parent | b62500a00872729d8b5cdc935bf7807114a39368 (diff) | |
Update dependencies on 'dev' in qt/qtdeclarative
And workaround hash issue for now by using qHashMulti
Also, fix test build failure
Change-Id: Ia6b696b2531149206c73e7a5a958d7fba74a0f19
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index 5acd3c9bf6..82bd9cd4ec 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -700,9 +700,7 @@ void QQuickTextNodeEngine::addFrameDecorations(QTextDocument *document, QTextFra size_t qHash(const QQuickTextNodeEngine::BinaryTreeNodeKey &key) { - // Just use the default hash for pairs - return qHash(qMakePair(key.fontEngine, qMakePair(key.clipNode, - qMakePair(key.color, key.selectionState)))); + return qHashMulti(/*seed=*/0, key.fontEngine, key.clipNode, key.color, key.selectionState); } void QQuickTextNodeEngine::mergeProcessedNodes(QList<BinaryTreeNode *> *regularNodes, |