diff options
author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:49:21 +0200 |
---|---|---|
committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:50:15 +0200 |
commit | 862f941bdc02f104e3aecc756a003f1c1f9f5112 (patch) | |
tree | 3ad5342cc2806d4dd51b88f26a9ff9e6eb30e63e /src/doc/src/declarative/qdeclarativeintro.qdoc | |
parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'src/doc/src/declarative/qdeclarativeintro.qdoc')
-rw-r--r-- | src/doc/src/declarative/qdeclarativeintro.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc index 97f88af8..e5e52407 100644 --- a/src/doc/src/declarative/qdeclarativeintro.qdoc +++ b/src/doc/src/declarative/qdeclarativeintro.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. @@ -212,7 +212,8 @@ QML properties are what is known as \e type-safe. That is, they only allow you t matches the property type. For example, the \c x property of item is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code Item { x: "hello" // illegal! } |