qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kai Koehne 2014-04-29 10:10:03 +02:00 committed by The Qt Project
parent f1d22063a4
commit 38eb0bef31
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qml/doc/src/qmllanguageref/qmlreference.qdoc
View File

@ -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}

10
src/qml/doc/src/qmllanguageref/syntax/basics.qdoc
View File

@ -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.

4
src/quick/doc/src/tutorial.qdoc
View File

@ -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.
@ -31,7 +31,7 @@
\brief An introduction to the basic concepts and features of QML.
\nextpage QML Tutorial 1 - Basic Types
This tutorial gives an introduction to QML, the declarative language for Qt Quick. It doesn't cover everything;
This tutorial gives an introduction to QML, the language for Qt Quick UIs. It doesn't cover everything;
the emphasis is on teaching the key principles, and features are introduced as needed.
Through the different steps of this tutorial we will learn about QML basic types, we will create our own QML component

6
tests/testapplications/text/text.qml
View File

@ -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."});
}

6
tests/testapplications/text/textedit.qml
View File

@ -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",

4
tests/testapplications/text/textinput.qml
View File

@ -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."});
}