From fb2961b14ced82e05ae1fbfaf3b4e4c10c3b4d66 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Thu, 23 Aug 2012 14:10:50 +1000 Subject: [PATCH] Link to Coding Conventions page Change-Id: I4c2870bf37ea1f9f110ced4120d4a622096d8dfe Reviewed-by: Andrew den Exter --- .../doc/src/appdevguide/applicationdevelopers.qdoc | 1 + .../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 4305506..40e5be8 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 89a1bd8..cf653f8 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 -- 1.7.2.5