diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:58:05 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-05 11:58:47 +0100 |
| commit | e701690f79a7a0eecdb98d32c8f5130b67637256 (patch) | |
| tree | 8ab3c3ad5092585b2f9ae7ecd08a8aba19ed2274 /tests/auto/qmltest/textedit/tst_textedit.qml | |
| parent | 00894e5af4867fdc48d723da1c7f8e5ff4d8556d (diff) | |
| parent | fdf004803d036583f58ceb832803cfe39c6ba6d8 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I5978bab8a4fde4c2ee33907fd81f49cb69e4fb26
Diffstat (limited to 'tests/auto/qmltest/textedit/tst_textedit.qml')
| -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 |