summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2011-02-01 06:20:27 (GMT)
committerBea Lam <bea.lam@nokia.com>2011-02-02 02:59:48 (GMT)
commita3010164fd904f4efe2dadb3df699004edaabd95 (patch)
tree60bd4fcf808fd24069c755ab676ad7a5f237fd66 /doc
parent0ee4b2f32a539ee5dc1c08a838f6584ca9d896d4 (diff)
downloadQt-a3010164fd904f4efe2dadb3df699004edaabd95.zip
Qt-a3010164fd904f4efe2dadb3df699004edaabd95.tar.gz
Qt-a3010164fd904f4efe2dadb3df699004edaabd95.tar.bz2
Move Qt.application docs into Qt global object page
Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/qmlviewer.qdoc3
-rw-r--r--doc/src/snippets/declarative/application.qml14
2 files changed, 10 insertions, 7 deletions
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index cfb762c..585b402 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -192,6 +192,9 @@ Rectangle {
}
\endqml
+\note Since Qt Quick 1.1 this information is accessible outside of the QML Viewer,
+through the \c active property of the \l {QML:Qt::application}{Qt.application} object.
+
\row
\o \c runtime.orientation
diff --git a/doc/src/snippets/declarative/application.qml b/doc/src/snippets/declarative/application.qml
index 2820ff2..06f83f2 100644
--- a/doc/src/snippets/declarative/application.qml
+++ b/doc/src/snippets/declarative/application.qml
@@ -42,12 +42,12 @@
import QtQuick 1.1
Rectangle {
- width: 300; height: 55
- color: Qt.application.active ? "white" : "lightgray"
- Text {
- text: "Application " + (Qt.application.active ? "active" : "inactive")
- opacity: Qt.application.active ? 1.0 : 0.5
- anchors.centerIn: parent
- }
+ width: 300; height: 55
+ color: Qt.application.active ? "white" : "lightgray"
+ Text {
+ text: "Application " + (Qt.application.active ? "active" : "inactive")
+ opacity: Qt.application.active ? 1.0 : 0.5
+ anchors.centerIn: parent
+ }
}
//! [document]