aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/tutorial.qdoc
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-04-29 10:10:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-07 08:38:36 +0200
commit38eb0bef31e4055ec8ab02b659349202050b2782 (patch)
treea750ed11cb228f71d72af51204f716d9a182b5d5 /src/quick/doc/src/tutorial.qdoc
parentf1d22063a4791627cb5d0844f3dc161d25321b6d (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/quick/doc/src/tutorial.qdoc')
-rw-r--r--src/quick/doc/src/tutorial.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index e0c05b16a8..75ca1b8d55 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.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.
@@ -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