diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 09:53:01 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-09 11:43:35 +0100 |
commit | 14f0efa0aea942b4483796d42e618366257f7a36 (patch) | |
tree | b0a1ebfbb70c07bdb0041e48e2852f241724d439 /tests/auto/qmltest/textedit | |
parent | 87e4279651cf691e82f266d61330f8daf4300da2 (diff) | |
parent | e701690f79a7a0eecdb98d32c8f5130b67637256 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Diffstat (limited to 'tests/auto/qmltest/textedit')
-rw-r--r-- | tests/auto/qmltest/textedit/tst_textedit.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmltest/textedit/tst_textedit.qml b/tests/auto/qmltest/textedit/tst_textedit.qml index 1dc7084049..a7fb2374b6 100644 --- a/tests/auto/qmltest/textedit/tst_textedit.qml +++ b/tests/auto/qmltest/textedit/tst_textedit.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Item { id: top |