diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-04 17:00:09 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-05 17:01:09 +0000 |
commit | 0f06accc02f8c06fccdfe80a769e6ee50bf5eb14 (patch) | |
tree | 188d6eac1d4526093939f335c24f107dbccff28c /tests | |
parent | 9f8b28f6c3359e8933a3453fd7d601047ff11606 (diff) |
Remove wrong Container revision registration
We register Container.qml for QtQuick.Controls 2.0, so it is important
to not override the registration with plain QQuickContainer template
revision 1 for QtQuick.Controls 2.1, or else the behavior of Container
will be different depending on whether the user imports QtQuick
Controls 2.0 or 2.1. The auto test started failing when the import
version was bumped from 2.0 to 2.1. This revealed that "Container" was
pointing to Container.qml in 2.0, and to QQuickContainer in 2.1.
Change-Id: I80b8de3bf556c57e4ae853b116d387431dfa02c7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/controls/data/tst_container.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml index d1ff54e0..3c7032c7 100644 --- a/tests/auto/controls/data/tst_container.qml +++ b/tests/auto/controls/data/tst_container.qml @@ -40,8 +40,8 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T TestCase { id: testCase |