diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /tests/auto/qmltest/animators/tst_mixed.qml | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'tests/auto/qmltest/animators/tst_mixed.qml')
| -rw-r--r-- | tests/auto/qmltest/animators/tst_mixed.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmltest/animators/tst_mixed.qml b/tests/auto/qmltest/animators/tst_mixed.qml index 488f1c8156..1e3600f80f 100644 --- a/tests/auto/qmltest/animators/tst_mixed.qml +++ b/tests/auto/qmltest/animators/tst_mixed.qml @@ -32,7 +32,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtTest 1.0 +import QtTest 1.1 Item { id: root; |