From 758349e729134061bb29583846826c47badb0472 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 12 Jan 2013 09:16:33 +0100 Subject: doc: Fix namespace version to 5.0.1 for qhp documentation Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk --- src/doc/qtdeclarative.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/doc') diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 6a87d453..96a769be 100644 --- a/src/doc/qtdeclarative.qdocconf +++ b/src/doc/qtdeclarative.qdocconf @@ -10,7 +10,7 @@ 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.501 qhp.QtDeclarative.virtualFolder = declarative qhp.QtDeclarative.indexTitle = Qt Quick qhp.QtDeclarative.indexRoot = -- cgit v1.2.3 From 515198a448975b1fa7daf295b86f9dbc4da04ee9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 30 Jan 2013 17:40:11 +0100 Subject: substitute fixed version numbers in qdocconf files with variables Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion --- src/doc/qtdeclarative.qdocconf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/doc') diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 96a769be..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.501 +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 -- cgit v1.2.3 From cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 14 Feb 2013 14:47:59 +0100 Subject: Doc: Removed reference to deprecated \badcode command. QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen Reviewed-by: Jerome Pasion --- src/doc/src/declarative/anchor-layout.qdoc | 3 ++- src/doc/src/declarative/propertybinding.qdoc | 3 ++- src/doc/src/declarative/qdeclarativeintro.qdoc | 3 ++- src/doc/src/declarative/qtbinding.qdoc | 6 ++---- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/doc') 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(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. */ - - -- cgit v1.2.3