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 /src/qml/doc | |
| 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 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/qmlreference.qdoc | 14 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/basics.qdoc | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc index 0bc8f90238..5111990b46 100644 --- a/src/qml/doc/src/qmllanguageref/qmlreference.qdoc +++ b/src/qml/doc/src/qmllanguageref/qmlreference.qdoc @@ -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 documentation of the Qt Toolkit. @@ -28,14 +28,14 @@ /*! \page qmlreference.html \title The QML Reference -\brief A declarative language for application development +\brief A multi-paradigm language for application development -QML is a declarative language for creating highly dynamic applications. With +QML is a multi-paradigm language for creating highly dynamic applications. With QML, application building blocks such as UI components are \e declared and -various properties set to define the application behavior. When coupled with -JavaScript, application behavior becomes scriptable. In addition, QML heavily -uses Qt, which allows types and other Qt features to be accessible directly from -QML applications. +various properties set to define the application behavior. Application behavior +can be further scripted through JavaScript, which is a subset of the language. +In addition, QML heavily uses Qt, which allows types and other Qt features to +be accessible directly from QML applications. This reference guide describes the features of the QML language. Many of the QML types in the guide originate from the \l{Qt QML} or \l{Qt Quick} diff --git a/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc b/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc index cdfab3cd3f..8d71a04ac2 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/basics.qdoc @@ -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 documentation of the Qt Toolkit. @@ -29,8 +29,12 @@ \title QML Syntax Basics \brief Description of the basics of QML syntax -QML is a declarative language that enables objects to be defined in terms of their attributes -and how they relate and respond to changes in other objects. In contrast to imperative code, where changes in attributes and behavior are expressed through a series of statements that are processed step by step, the declarative QML syntax integrates attribute and behavioral changes directly into the definitions of individual objects. +QML is a multi-paradigm language that enables objects to be defined in terms of their attributes +and how they relate and respond to changes in other objects. In contrast to purely imperative code, +where changes in attributes and behavior are expressed through a series of statements that are +processed step by step, QML's declarative syntax integrates attribute and behavioral changes +directly into the definitions of individual objects. These attribute definitions can then include +imperative code, in the case where complex custom application behavior is needed. QML source code is generally loaded by the engine through QML \e documents, which are standalone documents of QML code. These can be used to define \l {QML Object Types}{QML object types} that can then be reused throughout an application. |