diff options
author | Kai Koehne <kai.koehne@digia.com> | 2014-04-29 10:10:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-07 08:38:36 +0200 |
commit | 38eb0bef31e4055ec8ab02b659349202050b2782 (patch) | |
tree | a750ed11cb228f71d72af51204f716d9a182b5d5 /tests/testapplications | |
parent | f1d22063a4791627cb5d0844f3dc161d25321b6d (diff) |
Remove references of QML as a 'declarative' language
Though the core of QML is declarative, it incorporates JavaScript, a
multi-paradigm language on its own. It's therefore correct to call it
a multi-paradigm language, too.
Change-Id: Ia72acedafefb68ea8c49b9f6ab195ca9e73dad5f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/testapplications')
-rw-r--r-- | tests/testapplications/text/text.qml | 6 | ||||
-rw-r--r-- | tests/testapplications/text/textedit.qml | 6 | ||||
-rw-r--r-- | tests/testapplications/text/textinput.qml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/testapplications/text/text.qml b/tests/testapplications/text/text.qml index 56ca825d0a..b1e600a633 100644 --- a/tests/testapplications/text/text.qml +++ b/tests/testapplications/text/text.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -130,7 +130,7 @@ Rectangle { "value": "Qt Quick is a collection of technologies that are designed to help developers create the kind of intuitive, "+ "modern, fluid user interfaces that are increasingly used on mobile phones, media players, set-top boxes and other "+ "portable devices.\n"+ - "Qt Quick consists of a rich set of user interface elements, a declarative language for describing user interfaces "+ + "Qt Quick consists of a rich set of user interface elements, a language for describing user interfaces "+ "and a language runtime. "+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); textmodel.append({ "name": "Short", @@ -143,7 +143,7 @@ Rectangle { "value": "<b>Qt Quick</b> is a collection of technologies that are designed to help developers create the kind of <i>intuitive, "+ "modern, fluid</i> user interfaces that are increasingly used on mobile phones, media players, set-top boxes and other "+ "portable devices.<br>"+ - "Qt Quick consists of a rich set of user interface elements, a declarative language for describing user interfaces "+ + "Qt Quick consists of a rich set of user interface elements, a language for describing user interfaces "+ "and a language runtime. "+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); } diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml index 6546abfe91..3baa307d8d 100644 --- a/tests/testapplications/text/textedit.qml +++ b/tests/testapplications/text/textedit.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -127,7 +127,7 @@ Rectangle { "value": "Qt Quick is a collection of technologies that are designed to help developers create the kind of intuitive, "+ "modern, fluid user interfaces that are increasingly used on mobile phones, media players, set-top boxes and other "+ "portable devices."+texteditelement.newline+ - "Qt Quick consists of a rich set of user interface elements, a declarative language for describing user interfaces "+ + "Qt Quick consists of a rich set of user interface elements, a language for describing user interfaces "+ "and a language runtime.\n"+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); textmodel.append({ "name": "Short", @@ -140,7 +140,7 @@ Rectangle { "value": "<b>Qt Quick</b> is a collection of technologies that are designed to help developers create the kind of <i>intuitive, "+ "modern, fluid</i> user interfaces that are increasingly used on mobile phones, media players, set-top boxes and other "+ "portable devices.<br>"+ - "Qt Quick consists of a rich set of user interface elements, a declarative language for describing user interfaces "+ + "Qt Quick consists of a rich set of user interface elements, a language for describing user interfaces "+ "and a language runtime. "+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); textmodel.append({ "name": "Links", diff --git a/tests/testapplications/text/textinput.qml b/tests/testapplications/text/textinput.qml index 556771bcb5..d15d02232a 100644 --- a/tests/testapplications/text/textinput.qml +++ b/tests/testapplications/text/textinput.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -175,7 +175,7 @@ Rectangle { "value": "Qt Quick is a collection of technologies that are designed to help developers create the kind of intuitive, "+ "modern, fluid user interfaces that are increasingly used on mobile phones, media players, set-top boxes and other "+ "portable devices. "+ - "Qt Quick consists of a rich set of user interface elements, a declarative language for describing user interfaces "+ + "Qt Quick consists of a rich set of user interface elements, a language for describing user interfaces "+ "and a language runtime. "+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); } |