diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-04-07 20:40:29 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-04-07 23:13:17 +0300 |
commit | 39ba01da711c07c43abe8aeacedd98990874ba82 (patch) | |
tree | 4a1c8853bd8db754fbf57eac5fff21b7e7342c8a /tests/auto | |
parent | a33386e014db5fdf65903654e9b1ae542ee36c0f (diff) | |
parent | 5273ef2a8aa3c8d268b107edc770b53e1aed7803 (diff) |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qmldesigner/data/fx/attributes.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmldesigner/data/fx/empty.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmldesigner/data/fx/helloworld.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmldesigner/data/fx/properties.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qmldesigner/data/fx/states.qml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qml/qmldesigner/data/fx/attributes.qml b/tests/auto/qml/qmldesigner/data/fx/attributes.qml index f56ffd2b02..659a258105 100644 --- a/tests/auto/qml/qmldesigner/data/fx/attributes.qml +++ b/tests/auto/qml/qmldesigner/data/fx/attributes.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { id: id; diff --git a/tests/auto/qml/qmldesigner/data/fx/empty.qml b/tests/auto/qml/qmldesigner/data/fx/empty.qml index 4b9e826d36..62221ea919 100644 --- a/tests/auto/qml/qmldesigner/data/fx/empty.qml +++ b/tests/auto/qml/qmldesigner/data/fx/empty.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { } diff --git a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml index 81980f966b..65b232de9b 100644 --- a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml +++ b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Rectangle { width: 200 diff --git a/tests/auto/qml/qmldesigner/data/fx/properties.qml b/tests/auto/qml/qmldesigner/data/fx/properties.qml index 2a38819230..ffeb68a0ea 100644 --- a/tests/auto/qml/qmldesigner/data/fx/properties.qml +++ b/tests/auto/qml/qmldesigner/data/fx/properties.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Item { property bool pushed diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml index 91e7348d24..b0dd3f3d38 100644 --- a/tests/auto/qml/qmldesigner/data/fx/states.qml +++ b/tests/auto/qml/qmldesigner/data/fx/states.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 2.0 Rectangle { id: rect |