diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-03-27 22:28:24 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-30 01:12:32 +0100 |
commit | 064c99b87ed13ecc82311cc166361a409a969b45 (patch) | |
tree | 9a2d15a35ebbd309d1dc90c00eb97dd9d7135b48 | |
parent | 1f3038d2144603c687d85b0a7962322d3c9ae422 (diff) |
Doc: Update module "Qt Declarative" -> "Qt Quick"
Also update examples/README to show the relationship between Qt Quick
and Qt QML.
Change-Id: I4e50d9f0ddb1ac25ccdfed09f579f76a375b14fe
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
-rw-r--r-- | examples/README | 7 | ||||
-rw-r--r-- | examples/quick/accessibility/content/Checkbox.qml | 2 | ||||
-rw-r--r-- | examples/quick/accessibility/content/Slider.qml | 2 | ||||
-rw-r--r-- | examples/quick/shared/README | 2 | ||||
-rw-r--r-- | src/qml/doc/src/cppintegration/extending-tutorial.qdoc | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qquicksvgparser.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qquicksvgparser_p.h | 2 |
9 files changed, 12 insertions, 11 deletions
diff --git a/examples/README b/examples/README index aba1e2cc0d..f4567ab1d2 100644 --- a/examples/README +++ b/examples/README @@ -1,6 +1,7 @@ -The Qt Declarative module provides the ability to specify and implement -your user interface declaratively, using the Qt Meta-Object Language (QML). This -language is very expressive and human readable, and can be used by +The Qt Quick module provides the basic elements to specify and implement your +user interface declaratively, using the Qt Meta-Object Language (QML). The +Qt QML module provides the engine and language infrastructure for QML itself. +This language is very expressive and human readable, and can be used by designers to actually implement their UI vision. QML UIs can integrate with C++ code in many ways, including being loaded as a part of a C++ UI and loading data models from C++ and interacting with them. diff --git a/examples/quick/accessibility/content/Checkbox.qml b/examples/quick/accessibility/content/Checkbox.qml index 7c20f55e90..c4b8e8e380 100644 --- a/examples/quick/accessibility/content/Checkbox.qml +++ b/examples/quick/accessibility/content/Checkbox.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/quick/accessibility/content/Slider.qml b/examples/quick/accessibility/content/Slider.qml index c6eaca30a2..1a71e515f6 100644 --- a/examples/quick/accessibility/content/Slider.qml +++ b/examples/quick/accessibility/content/Slider.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/quick/shared/README b/examples/quick/shared/README index bf16f238c7..2bf26d7c88 100644 --- a/examples/quick/shared/README +++ b/examples/quick/shared/README @@ -7,5 +7,5 @@ new to QML are strongly encouraged to go through the official examples before delving into this directory. For most application use, see the Qt Quick Components project to find -ready-made Components you can use in your own projects. Qt Declarative +ready-made Components you can use in your own projects. Qt Quick examples do not use them only to avoid external dependencies. diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc index 247e60411f..bea464c8f6 100644 --- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc +++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc @@ -72,7 +72,7 @@ For example, this could be done to implement particular data models, or provide types with custom painting and drawing capabilities, or access system features like network programming that are not accessible through built-in QML features. -In this tutorial, we will show how to use the C++ classes in the Qt Declarative +In this tutorial, we will show how to use the C++ classes in the Qt Quick module to extend QML. The end result will be a simple Pie Chart display implemented by several custom QML types connected together through QML features like bindings and signals, and made available to the QML runtime through a plugin. diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp index 0a73fd9ec3..59bde0d602 100644 --- a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp +++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h index f3fb92cbc5..4cd58da2e4 100644 --- a/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h +++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/quick/util/qquicksvgparser.cpp b/src/quick/util/qquicksvgparser.cpp index cfabaaa4a0..760b4b0e2f 100644 --- a/src/quick/util/qquicksvgparser.cpp +++ b/src/quick/util/qquicksvgparser.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclaractive module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/quick/util/qquicksvgparser_p.h b/src/quick/util/qquicksvgparser_p.h index e612ab30b1..9f7b8cd704 100644 --- a/src/quick/util/qquicksvgparser_p.h +++ b/src/quick/util/qquicksvgparser_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtDeclaractive module of the Qt Toolkit. +** This file is part of the Qt Quick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage |