diff --git a/src/qtdesktop/TextArea.qml b/src/qtdesktop/TextArea.qml index ea27cd245347596ddb3f713b2a03db506985e2ad..4d647c655e3e10bbeaf442a87400255524189f5f 100644 --- a/src/qtdesktop/TextArea.qml +++ b/src/qtdesktop/TextArea.qml @@ -489,7 +489,9 @@ ScrollArea { Appends \a string as a new line to the end of the text area. */ function append (string) { - text += "\n" + string + if (length) + string = "\n" + string + text += string verticalScrollBar.value = verticalScrollBar.maximumValue } diff --git a/tests/auto/qtdesktop/data/tst_textarea.qml b/tests/auto/qtdesktop/data/tst_textarea.qml new file mode 100644 index 0000000000000000000000000000000000000000..d266a4039e23264382f09b89e40d8d0159594178 --- /dev/null +++ b/tests/auto/qtdesktop/data/tst_textarea.qml @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Components project. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 + +TestCase { + id: testCase + name: "Tests_TextArea" + when: windowShown + width: 400 + height: 400 + + function test_append() { + var textarea = Qt.createQmlObject('import QtDesktop 1.0; TextArea {}', testCase, '') + + compare(textarea.text, "") + + textarea.append("my") + compare(textarea.text, "my") + + textarea.append("name"); + compare(textarea.text, "my\nname") + } +} diff --git a/tests/auto/qtdesktop/qtdesktop.pro b/tests/auto/qtdesktop/qtdesktop.pro index 054840fce3f2f8af8cc1b390a4fa9c80d109cfda..11db472048f9bd6522f7e603a06bdf08718e9b1f 100644 --- a/tests/auto/qtdesktop/qtdesktop.pro +++ b/tests/auto/qtdesktop/qtdesktop.pro @@ -20,6 +20,7 @@ OTHER_FILES += \ $$PWD/data/tst_rangemodel.qml \ $$PWD/data/tst_scrollarea.qml \ $$PWD/data/tst_menu.qml \ - $$PWD/data/tst_textfield.qml + $$PWD/data/tst_textfield.qml \ + $$PWD/data/tst_textarea.qml DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0