summaryrefslogtreecommitdiffstats
path: root/src/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-18 16:08:40 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-18 16:08:40 +0100
commitaa8e59c09cb03f56047ca65c3e89dd6daeec4d73 (patch)
treed45d5513511b0767925f453b637bda08139562da /src/doc
parentae764c678c78c1e3530a6d0dc2de2a17c5d4815a (diff)
parentcf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/qtdeclarative.qdocconf12
-rw-r--r--src/doc/src/declarative/anchor-layout.qdoc3
-rw-r--r--src/doc/src/declarative/propertybinding.qdoc3
-rw-r--r--src/doc/src/declarative/qdeclarativeintro.qdoc3
-rw-r--r--src/doc/src/declarative/qtbinding.qdoc6
5 files changed, 14 insertions, 13 deletions
diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf
index 6a87d453..e15a68c2 100644
--- a/src/doc/qtdeclarative.qdocconf
+++ b/src/doc/qtdeclarative.qdocconf
@@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtDeclarative
description = "Qt Declarative Examples Documentation"
-url = http://qt-project.org/doc/qt-5.0/qtdeclarative
-version = 5.0.1
+url = http://qt-project.org/doc/qt-$QT_VER/qtdeclarative
+version = $QT_VERSION
exampleinstallpath = declarative
qhp.projects = QtDeclarative
qhp.QtDeclarative.file = qtdeclarative.qhp
-qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.500
+qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.$QT_VERSION_TAG
qhp.QtDeclarative.virtualFolder = declarative
qhp.QtDeclarative.indexTitle = Qt Quick
qhp.QtDeclarative.indexRoot =
-qhp.QtDeclarative.filterAttributes = declarative 5.0.1 qtrefdoc
-qhp.QtDeclarative.customFilters.Qt.name = declarative 5.0.1
-qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative 5.0.1
+qhp.QtDeclarative.filterAttributes = declarative $QT_VERSION qtrefdoc
+qhp.QtDeclarative.customFilters.Qt.name = declarative $QT_VERSION
+qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative $QT_VERSION
depends += qtcore qtgui qtscript qtdoc
diff --git a/src/doc/src/declarative/anchor-layout.qdoc b/src/doc/src/declarative/anchor-layout.qdoc
index a1c83cec..8aff358a 100644
--- a/src/doc/src/declarative/anchor-layout.qdoc
+++ b/src/doc/src/declarative/anchor-layout.qdoc
@@ -124,7 +124,8 @@ edge, the margin is not applied.
For performance reasons, you can only anchor an item to its siblings and direct parent. For example,
the following anchor is invalid and would produce a warning:
-\badcode
+\code
+//bad code
Item {
id: group1
Rectangle { id: rect1; ... }
diff --git a/src/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc
index 60de77ce..450d2265 100644
--- a/src/doc/src/declarative/propertybinding.qdoc
+++ b/src/doc/src/declarative/propertybinding.qdoc
@@ -109,7 +109,8 @@ properties only allow you to assign a value that matches the property type. For
example, if a property is a real, and if you try to assign a string to it you
will get an error.
-\badcode
+\code
+//bad code
property real volume: "four" //generates an error
\endcode
diff --git a/src/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc
index 8fdc03aa..e5e52407 100644
--- a/src/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/src/doc/src/declarative/qdeclarativeintro.qdoc
@@ -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!
}
diff --git a/src/doc/src/declarative/qtbinding.qdoc b/src/doc/src/declarative/qtbinding.qdoc
index 58d28159..f173025c 100644
--- a/src/doc/src/declarative/qtbinding.qdoc
+++ b/src/doc/src/declarative/qtbinding.qdoc
@@ -391,8 +391,8 @@ say you have a custom element \c PushButton with a \c buttonText property that i
the value of a \c m_buttonText member variable. Modifying the member variable directly like this is
not a good idea:
-\badcode
-// BAD!
+\code
+//bad code
QDeclarativeComponent component(engine, "MyButton.qml");
PushButton *button = qobject_cast<PushButton*>(component.create());
button->m_buttonText = "Click me";
@@ -665,5 +665,3 @@ be used to build the application resources:
See \l {The Qt Resource System} for more information.
*/
-
-