diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:04:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:04:47 +0200 |
| commit | fc3fd8ccb1aac8a66c4b53e4d3b767b29cffe54f (patch) | |
| tree | 5ef54164da4bbf9d5822ad5e3d28bbaf456a7cd6 | |
| parent | 0cce4b619e463a82b2a49542fde4bea94bd2c381 (diff) | |
| parent | e08a6055854464ede380380d966be1a68f5b13eb (diff) | |
| download | qtivi-fc3fd8ccb1aac8a66c4b53e4d3b767b29cffe54f.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If63ab467ba3c3e79164ced194316de56fbb6e825
| -rw-r--r-- | tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml b/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml index cac548c..73ca1b5 100644 --- a/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml +++ b/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml @@ -28,6 +28,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtIvi 1.0 import testfeature 1.0 Item { @@ -43,7 +44,9 @@ Item { } function discover() { - noAutoItem.discoveryMode = TestFeature.LoadOnlyProductionBackends + // We have to use AbstractFeature here instead of TestFeature because of + // QTBUG-83703 + noAutoItem.discoveryMode = AbstractFeature.LoadOnlyProductionBackends noAutoItem.startAutoDiscovery() } } |