aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-05-16 16:15:57 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-21 08:40:39 +0200
commitb2f9a9a48e805133f49ff0a4491a93f12f770dc0 (patch)
tree840d643635e0e0949407b98ba8b0b7c7e38323eb /doc
parent95873956903fe195504491bbc9e50a63cf5c8307 (diff)
Doc: Moved and added Qt Quick and Qt QML documentation.
-moved the documentation to separate aspects: QML the language QML engine QML bindings -fixed landing page for Qt Quick -removed duplicate module pages -added content as a base structure -added Qt QML source in the Qt Quick module documentation Part of QTBUG-25689 Change-Id: Ib12ceedfbd689a9f764a91e669bc7c2a433643aa Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/qtquick2/qtdeclarative.qdoc180
-rw-r--r--doc/src/qtquick2/qtquick2.qdoc38
2 files changed, 0 insertions, 218 deletions
diff --git a/doc/src/qtquick2/qtdeclarative.qdoc b/doc/src/qtquick2/qtdeclarative.qdoc
deleted file mode 100644
index fcba1fec64..0000000000
--- a/doc/src/qtquick2/qtdeclarative.qdoc
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-/*!
-\title Qt Quick
-\page qtquick-reference.html
-\inqmlmodule QtQuick 2
-\ingroup qt-gui-concepts
-\ingroup overviews
-
-\brief Qt Quick provides a declarative framework for building highly
-dynamic applications.
-
-For App Developers and Designers, who want to deliver apps with amazing user
-experience, Qt provides the QML language, the Qt Quick Elements, and tools in Qt
-Creator that make it faster than ever to transform your brilliant idea into a
-winning App across mobile, embedded, and desktop platforms.
-
-\target qtquick-overviews
-\div {class="threecolumn_area"}
- \div {class="heading"}
- QML Topics
- \enddiv
- QML is a declarative language for creating flexible and reusable
- components. The QML runtime powers QML based applications. The runtime
- includes a QML engine, JavaScript engine, and mechanism to bind to the Qt
- Framework.
-
- \div {class=" threecolumn_piece"}
- \div {class="heading"}
- QML Essentials
- \enddiv
- \list
- \li \l{QML Components}{Components}
- \li \l{Properties and Property Binding in QML}{Properties and Property Binding}
- \li \l{JavaScript Expressions in QML}{JavaScript Code}
- \li \l{QML Signal and Handler Event System}{Signal and Handler Event System}
- \li \l{QML Modules}{Modules}
- \endlist
- \list
- \li \l{What's New in Qt Quick 2}{What's New in Qt Quick}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- QML Engine
- \enddiv
- \list
- \li \l{The QML Engine}
- \li \l{QML Global Object}
- \li \l{Dynamic Object Management in QML}{Dynamic Object Management}
- \li \l{QML Performance}{Performance}
- \endlist
- \enddiv
- \div {class=" threecolumn_piece"}
- \div {class="heading"}
- Reference
- \enddiv
- \list
- \li \l{QML Syntax}
- \li \l{QML Basic Types}{Data Types}
- \li \l{QML Coding Conventions}{Coding Conventions}
- \li \l{QML Security}{Security Model}
- \li \l{QML Scope}{Scope Model}
- \li \l{QML Documents}{Documents}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- QML Bindings with Qt C++
- \enddiv
- \list
- \li \l{Creating QML Types}
- \li \l{QML Plugins}
- \li \l{Exposing C++ Models}
- \li \l{Integrating QML Code with Existing Qt UI Code}{Qt Gui Porting Information}
- \endlist
- \enddiv
- \div {class=" threecolumn_piece"}
- \div {class="heading"}
- Tools
- \enddiv
- \list
- \li \l{QML Internationalization}{Internationalization}
- \li \l{QtQuickTest Reference Documentation}
- \li \l{Debugging QML}
- \endlist
- \enddiv
-\enddiv
-\div {class="threecolumn_area"}
- \div {class="heading"}
- Qt Quick Elements
- \enddiv
- Qt Quick Elements features graphical elements, user input system,
- animation system, and data visualization through models and delegates.
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- Graphics and Special Effects
- \enddiv
- \list
- \li \l{Basic Elements}{Basic Elements}
- \li \l{Painting with Canvas API}
- \li \l{Using the Qt Quick Particle System}{Particle Effects}
- \li \l{Shader Effects in QML}{Shader Effects}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- Anchoring and Layouts
- \enddiv
- \list
- \li \l{Component Layouts}
- \li \l{Layouts with Anchors}
- \li \l{Right-to-left User Interfaces}{Right-to-left User Interfaces}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- Mouse and Keyboard Input
- \enddiv
- \list
- \li \l{Mouse Events}{Mouse Events}
- \li \l{Text Handling and Validators}{Text Handling and Validators}
- \li \l{Keyboard Focus in QML}{Keyboard Focus}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- States and Transitions
- \enddiv
- \list
- \li \l{States}{States}
- \li \l{QML Animation and Transitions}{Animation and Transitions}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- Data with Models and Views
- \enddiv
- \list
- \li {Models and Views}
- \endlist
- \enddiv
- \div {class="threecolumn_piece"}
- \div {class="heading"}
- Data Storage and Resources
- \enddiv
- \list
- \li \l{Local Storage}{SQL Local Storage}
- \li \l{Resource Loading and Network Transparency in QML}{Resources and Network Transparency}
- \endlist
- \enddiv
-\enddiv
-
-*/
-
diff --git a/doc/src/qtquick2/qtquick2.qdoc b/doc/src/qtquick2/qtquick2.qdoc
deleted file mode 100644
index 20361adb16..0000000000
--- a/doc/src/qtquick2/qtquick2.qdoc
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-/*!
- \qmlmodule QtQuick 2
- \title QML Module QtQuick 2
-
- \brief The QML Elements
-
- This QML module contains all the QML elements that are
- instantiated as objects of C++ classes in the QtQml
- module. These elements work with the Scenegraph renderer and
- their own canvas.
- */