diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2020-06-05 14:46:49 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-08 12:11:57 +0000 |
| commit | 53380162cebb64944877a8c49bb4adc5ec7b2d4d (patch) | |
| tree | 5b32d4867c34e344f517344e7f51c0ae0320a026 | |
| parent | f02a6c040990e68d3fda1294499fcc956dfdd599 (diff) | |
Update dependencies on 'dev' in qt/qtdeclarative
Change error to errorOcurred as the former is gone now in qtbase.
Change-Id: I1c8ff9c5d9ebd9346ccc3861dac7fbb41279dd2a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 58b1a5d4d2..9841e06edb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 1b33ee95e5c6e5e27f732fd273920861fdae486a + ref: c49728eb27be0f3f2eaaa77b0ed573f5d8705af1 required: true ../qtsvg: - ref: 338369de3c4fdb97927a446f2f2d8d36c9ffb093 + ref: fd4d19bf8f878f18d0705530e73722981906f22a required: false diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp index 8a82db3456..e5a6573ca7 100644 --- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp +++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp @@ -269,7 +269,7 @@ public: return; m_buffer.clear(); setError(ContentNotFoundError, "content not found"); - emit error(ContentNotFoundError); + emit errorOccurred(ContentNotFoundError); setFinished(true); emit finished(); } |