From 186c2d0c2effa11b472d37165cd82b94393b11a1 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@nokia.com>
Date: Tue, 22 May 2012 12:04:25 +0200
Subject: [PATCH] Doc: Added two new articles for the QML documentation

-for the new documentation structure

Change-Id: I5b047fb47e479eb1ae25bd44f8e29b6b705f1b83
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
---
 src/qml/doc/src/qml/qmllanguage-javascript.qdoc    | 40 ++++++++++++++++++
 .../doc/src/qml/qmllanguage-types-properties.qdoc  | 49 ++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 src/qml/doc/src/qml/qmllanguage-javascript.qdoc
 create mode 100644 src/qml/doc/src/qml/qmllanguage-types-properties.qdoc

diff --git a/src/qml/doc/src/qml/qmllanguage-javascript.qdoc b/src/qml/doc/src/qml/qmllanguage-javascript.qdoc
new file mode 100644
index 0000000..1f4f4c6
--- /dev/null
+++ b/src/qml/doc/src/qml/qmllanguage-javascript.qdoc
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/*!
+\page qmllanguage-javascript.html
+\ingroup qt-gui-concepts
+\ingroup overviews
+\title JavaScript Expressions
+\brief Adding JavaScript Expressions for logic and dynamic applications
+
+\section1 JavaScript Expressions
+    \list
+    \li \l{List of JavaScript Objects and Functions}
+    \li \l{JavaScript Expressions in QML}{JavaScript Reference}
+    \endlist
+
+*/
diff --git a/src/qml/doc/src/qml/qmllanguage-types-properties.qdoc b/src/qml/doc/src/qml/qmllanguage-types-properties.qdoc
new file mode 100644
index 0000000..24c0dde
--- /dev/null
+++ b/src/qml/doc/src/qml/qmllanguage-types-properties.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/*!
+\page qmllanguage-types-properties.html
+\ingroup qt-gui-concepts
+\ingroup overviews
+\title QML Types and Properties
+\brief Provides a declarative language for building highly
+dynamic applications.
+
+
+\section1 Types, Components, and Objects
+    \list
+    \li \l{QML Basic Types}{Basic Types}
+    \li \l{QML Types}
+    \li \l{QML Components}{Components}
+    \li \l{Dynamic Object Management in QML}{Dynamic Object Management}
+    \endlist
+
+\section1 Properties
+    \list
+    \li \l{Properties and Property Binding in QML}{Properties and Property Binding}
+    \endlist
+
+*/
-- 
2.7.4