diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-08-23 14:10:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-24 02:52:30 +0200 |
| commit | fb2961b14ced82e05ae1fbfaf3b4e4c10c3b4d66 (patch) | |
| tree | 576cf98882e934f23a2faaa5a6417d48fc652ae5 /src/quick | |
| parent | 19e14d8e2aceb449d3788313165bd371be714a24 (diff) | |
Link to Coding Conventions page
Change-Id: I4c2870bf37ea1f9f110ced4120d4a622096d8dfe
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/src/appdevguide/applicationdevelopers.qdoc | 1 | ||||
| -rw-r--r-- | src/quick/doc/src/appdevguide/codingconventions.qdoc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc index 4305506cb7..40e5be8894 100644 --- a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc +++ b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc @@ -137,6 +137,7 @@ provided by Qt Quick, please see the \l{Qt Quick} module documentation. \li \l{qtquick-debugging.html}{Debugging QML Applications} \li \l{qtquick-qtquicktest.html}{QtQuickTest: QML Unit Testing Framework} \endlist +\li \l{qml-codingconventions.html}{QML Coding Conventions} \li \l{qtquick-glossary.html}{Glossary of Terms} \endlist diff --git a/src/quick/doc/src/appdevguide/codingconventions.qdoc b/src/quick/doc/src/appdevguide/codingconventions.qdoc index 89a1bd8cb3..cf653f8116 100644 --- a/src/quick/doc/src/appdevguide/codingconventions.qdoc +++ b/src/quick/doc/src/appdevguide/codingconventions.qdoc @@ -26,15 +26,15 @@ ****************************************************************************/ /*! -\page qml-coding-conventions.html +\page qml-codingconventions.html \title QML Coding Conventions \brief code style convention This document contains the QML coding conventions that we follow in our documentation and examples and recommend that others follow. -\section1 QML Objects +\section1 QML Object Declarations -Through our documentation and examples, QML objects are always structured in the following order: +Throughout our documentation and examples, \l{QML Object Attributes}{QML object attributes} are always structured in the following order: \list \li id |