diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-04-03 11:10:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-03 19:57:54 +0200 |
| commit | 2573021475b799f58575baf24088ca337bb982b9 (patch) | |
| tree | 681db60e48ce32042cc03f6fd5d7442840a4d17a | |
| parent | ef2e5a39fa188c0fb229e7847b5ac3f177ba778e (diff) | |
Doc: Fix some code snippet warnings
Seems like \qml \endqml is not able to parse some snippets, so using
\code \endcode instead to fix warnings like:
Unable to parse QML snippet: "Expected token `{'" at line 1, column 13
Change-Id: Iecf033ff5610405d946390e69c3aa7ec54a21998
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickscreen.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index f6da64f913..88080b1895 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -113,12 +113,12 @@ public: of the binding is undefined when the mouse isn't pressed. We can use the Binding type to rewrite the above code and avoid the warning. - \qml + \code Binding on value { when: mouse.pressed value: mouse.mouseX } - \endqml + \endcode The Binding type will also restore any previously set direct bindings on the property. In that sense, it functions much like a simplified State. diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 7ac37c2853..d1bad78d41 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1737,9 +1737,9 @@ void QQuickFlickable::setRebound(QQuickTransition *transition) and \l {Item::childrenRect.height}{childrenRect.height} properties of the \l contentItem. For example, the previous snippet could be rewritten with: - \qml + \code contentWidth: contentItem.childrenRect.width; contentHeight: contentItem.childrenRect.height - \endqml + \endcode Though this assumes that the origin of the childrenRect is 0,0. */ diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index 54c7527eec..82f4f0af3e 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.cpp @@ -108,9 +108,9 @@ QT_BEGIN_NAMESPACE such as task bars and system menus. If you want to position a Window at the right of the desktop, you can bind to it like this: - \qml + \code x: Screen.desktopAvailableWidth - width - \endqml + \endcode */ /*! \qmlattachedproperty int Screen::desktopAvailableHeight @@ -122,9 +122,9 @@ QT_BEGIN_NAMESPACE such as task bars and system menus. If you want to position a Window at the bottom of the desktop, you can bind to it like this: - \qml + \code y: Screen.desktopAvailableHeight - height - \endqml + \endcode */ /*! \qmlattachedproperty real Screen::logicalPixelDensity |