diff options
author | Dominik Holland <dominik.holland@qt.io> | 2020-07-07 09:25:02 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2020-07-07 09:25:02 +0200 |
commit | 027ad3c7810b17ebdb0f9572a49d9b2e5b2bc4a7 (patch) | |
tree | e4634e39a71bd4de86312e6d0f7977e46d328a4b /tests/auto/core | |
parent | 276a3b42467768ebc57891bcfef261ae53d1fa70 (diff) | |
parent | 26dc6d41c48b15515a9439c91969c167e5599b3f (diff) | |
download | qtivi-027ad3c7810b17ebdb0f9572a49d9b2e5b2bc4a7.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4844aa74bb361610dfff6e381b5a7f68cd990044
Diffstat (limited to 'tests/auto/core')
-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() } } |