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 | |
| 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>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 9841e06edb..088227ffbd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: c49728eb27be0f3f2eaaa77b0ed573f5d8705af1 + ref: ad532ce118b7052be3b69999cef2eb610e66fa88 required: true ../qtsvg: - ref: fd4d19bf8f878f18d0705530e73722981906f22a + ref: 0f0c04faf0f83b304afbb4fe65f44b6bbe2bb3f3 required: false 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, diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 6092eb855c..f32f57614d 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -3188,9 +3188,9 @@ void tst_qquickwindow::findChild() class DeliveryRecord : public QPair<QString, QString> { public: - DeliveryRecord(const QString &filter, const QString &receiver) : QPair(filter, receiver) { } - DeliveryRecord(const QString &receiver) : QPair(QString(), receiver) { } - DeliveryRecord() : QPair() { } + DeliveryRecord(const QString &filter, const QString &receiver) : QPair<QString, QString>(filter, receiver) { } + DeliveryRecord(const QString &receiver) : QPair<QString, QString>(QString(), receiver) { } + DeliveryRecord() : QPair<QString, QString>() { } QString toString() const { if (second.isEmpty()) return QLatin1String("Delivery(no receiver)"); |