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 /examples | |
| parent | 00894e5af4867fdc48d723da1c7f8e5ff4d8556d (diff) | |
| parent | fdf004803d036583f58ceb832803cfe39c6ba6d8 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I5978bab8a4fde4c2ee33907fd81f49cb69e4fb26
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmltest/qmltest/tst_basic.qml | 4 | ||||
| -rw-r--r-- | examples/qmltest/qmltest/tst_item.qml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/qmltest/qmltest/tst_basic.qml b/examples/qmltest/qmltest/tst_basic.qml index ba5ebe935a..1d9efbab61 100644 --- a/examples/qmltest/qmltest/tst_basic.qml +++ b/examples/qmltest/qmltest/tst_basic.qml @@ -31,8 +31,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick 2.4 +import QtTest 1.1 TestCase { name: "BasicTests" diff --git a/examples/qmltest/qmltest/tst_item.qml b/examples/qmltest/qmltest/tst_item.qml index 69e2b83a00..966d7e1bfe 100644 --- a/examples/qmltest/qmltest/tst_item.qml +++ b/examples/qmltest/qmltest/tst_item.qml @@ -31,8 +31,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick 2.4 +import QtTest 1.1 Rectangle { id: foo |