From 985787e85dd9d00cb7a5d1e412383b9883f2fe7f Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Mon, 30 May 2011 09:44:27 +1000 Subject: [PATCH] fix typos Change-Id: Iff14f7378bf8fa063bd6096a8662d47320564af6 --- .../qmltest/qdecarativebinding/tst_binding.qml | 75 ------ .../qmltest/qdecarativebinding/tst_binding2.qml | 70 ------ .../qdecarativeborderimage/InvalidSciFile.qml | 48 ---- .../qdecarativeborderimage/colors-round.sci | 7 - .../auto/qmltest/qdecarativeborderimage/colors.png | Bin 1655 -> 0 bytes .../qmltest/qdecarativeborderimage/invalid.sci | 7 - .../qdecarativeborderimage/tst_borderimage.qml | 247 -------------------- .../qmltest/qdeclarativebinding/tst_binding.qml | 75 ++++++ .../qmltest/qdeclarativebinding/tst_binding2.qml | 70 ++++++ .../qdeclarativeborderimage/InvalidSciFile.qml | 48 ++++ .../qdeclarativeborderimage/colors-round.sci | 7 + .../qmltest/qdeclarativeborderimage/colors.png | Bin 0 -> 1655 bytes .../qmltest/qdeclarativeborderimage/invalid.sci | 7 + .../qdeclarativeborderimage/tst_borderimage.qml | 247 ++++++++++++++++++++ tests/auto/qmltest/qmltest.pro | 4 +- 15 files changed, 456 insertions(+), 456 deletions(-) delete mode 100644 tests/auto/qmltest/qdecarativebinding/tst_binding.qml delete mode 100644 tests/auto/qmltest/qdecarativebinding/tst_binding2.qml delete mode 100644 tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml delete mode 100644 tests/auto/qmltest/qdecarativeborderimage/colors-round.sci delete mode 100644 tests/auto/qmltest/qdecarativeborderimage/colors.png delete mode 100644 tests/auto/qmltest/qdecarativeborderimage/invalid.sci delete mode 100644 tests/auto/qmltest/qdecarativeborderimage/tst_borderimage.qml create mode 100644 tests/auto/qmltest/qdeclarativebinding/tst_binding.qml create mode 100644 tests/auto/qmltest/qdeclarativebinding/tst_binding2.qml create mode 100644 tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml create mode 100644 tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci create mode 100644 tests/auto/qmltest/qdeclarativeborderimage/colors.png create mode 100644 tests/auto/qmltest/qdeclarativeborderimage/invalid.sci create mode 100644 tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml diff --git a/tests/auto/qmltest/qdecarativebinding/tst_binding.qml b/tests/auto/qmltest/qdecarativebinding/tst_binding.qml deleted file mode 100644 index 5c883c5..0000000 --- a/tests/auto/qmltest/qdecarativebinding/tst_binding.qml +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.0 - -Rectangle { - id: screen - width: 320; height: 240 - property string text - property bool changeColor: false - - Text { id: s1; text: "Hello" } - Rectangle { id: r1; width: 1; height: 1; color: "yellow" } - Rectangle { id: r2; width: 1; height: 1; color: "red" } - - Binding { target: screen; property: "text"; value: s1.text; id: binding1 } - Binding { target: screen; property: "color"; value: r1.color } - Binding { target: screen; property: "color"; when: screen.changeColor == true; value: r2.color; id: binding3 } - - TestCase { - name: "Binding" - - function test_binding() { - compare(screen.color, "#ffff00") // Yellow - compare(screen.text, "Hello") - verify(!binding3.when) - - screen.changeColor = true - compare(screen.color, "#ff0000") // Red - - verify(binding1.target == screen) - compare(binding1.property, "text") - compare(binding1.value, "Hello") - } - } -} diff --git a/tests/auto/qmltest/qdecarativebinding/tst_binding2.qml b/tests/auto/qmltest/qdecarativebinding/tst_binding2.qml deleted file mode 100644 index 85e1951..0000000 --- a/tests/auto/qmltest/qdecarativebinding/tst_binding2.qml +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.0 - -Rectangle { - id: screen - width: 320; height: 240 - property string text - property bool changeColor: false - - Text { id: s1; text: "Hello" } - Rectangle { id: r1; width: 1; height: 1; color: "yellow" } - Rectangle { id: r2; width: 1; height: 1; color: "red" } - - Binding { target: screen; property: "text"; value: s1.text } - Binding { target: screen; property: "color"; value: r1.color } - Binding { target: screen; property: "color"; value: r2.color; when: screen.changeColor == true } - - TestCase { - name: "Binding2" - - function test_binding2() { - compare(screen.color, "#ffff00") // Yellow - compare(screen.text, "Hello") - - screen.changeColor = true - compare(screen.color, "#ff0000") // Red - } - } -} diff --git a/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml deleted file mode 100644 index d8a6d89..0000000 --- a/tests/auto/qmltest/qdecarativeborderimage/InvalidSciFile.qml +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -BorderImage { - source: "invalid.sci" - width: 300 - height: 300 -} diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci b/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci deleted file mode 100644 index 5d2f49f..0000000 --- a/tests/auto/qmltest/qdecarativeborderimage/colors-round.sci +++ /dev/null @@ -1,7 +0,0 @@ -border.left:10 -border.top:20 -border.right:30 -border.bottom:40 -horizontalTileRule:Round -verticalTileRule:Repeat -source:colors.png diff --git a/tests/auto/qmltest/qdecarativeborderimage/colors.png b/tests/auto/qmltest/qdecarativeborderimage/colors.png deleted file mode 100644 index dfb62f3d64e95a26d2ea1e87065e7892fa7814a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1655 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