Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick into 4.7

5 files changed, 337 insertions, 83 deletions

diff --git a/doc/src/images/mobile.png b/doc/src/images/mobile.png
new file mode 100644
index 0000000..af460e2
--- /dev/null
+++ b/doc/src/images/mobile.png
diff --git a/doc/src/images/qml.png b/doc/src/images/qml.png
new file mode 100644
index 0000000..b1e4ab6
--- /dev/null
+++ b/doc/src/images/qml.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 98d571b..6e745f0 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -26,94 +26,113 @@
 ****************************************************************************/
 
 /*!
-    \page index.html
-    \keyword Qt Reference Documentation
+\page index.html
+\keyword Qt Reference Documentation
 
-          \div {indexbox guide}
+\div {indexbox guide}
+    \div {heading}
+        Qt Developer Guide
+    \enddiv
+\enddiv
+\div {indexbox tools}
+    \div {indexboxcont indexboxbar }
+        \div {sectionlist normallist}
             \div {heading}
-              Qt Developer Guide 
-	    \enddiv
-            \div {indexboxcont indexboxbar}
-              \div {section indexIcon} \emptyspan
-              \enddiv
-              \div {section}
-                Qt is a cross-platform application and UI
-                framework. Using Qt, you can write web-enabled
-                applications once and deploy them across desktop,
-                mobile and embedded operating systems without
-                rewriting the source code.
-              \enddiv
-              \div {section sectionlist}
-                \list
-                  \o \l{Getting Started Guides}{Getting started}
-                  \o \l{Installation}{Installation}
-                  \o \l{how-to-learn-qt.html}{How to learn Qt}
-                  \o \l{Supported Platforms}{Platform Support}
-                  \o \l{tutorials.html}{Tutorials} and \l{Qt Examples}{Examples}
-                  \o \l{qt4-7-intro.html}{What's new in Qt 4.7}
-                \endlist
-             \enddiv
+                \l What is Qt
             \enddiv
-          \enddiv
-          \div {indexbox api}
+            \image qt-logo.png
+            \list
+            \o \l{http://doc.qt.nokia.com/nokia-qtsdk-1.0/index.html}{Nokia Qt SDK}
+            \o \l{What's New in Qt 4.7} - latest release
+            \endlist
+            \list
+            \o \l{http://developer.qt.nokia.com/wiki/QtWhitepaper}{Qt C++ Framework}
+            \o \l{http://developer.qt.nokia.com/wiki/QtCreatorWhitepaper}{Qt Creator}
+            \o \l{Qt Quick}
+            \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/index.html}{Qt Mobility}
+            \o \l{http://doc.qt.nokia.com/qtsimulator-1.1/index.html}{Qt Simulator}
+            \o \l{Supported Platforms}{Platform Support}
+            \o \l{http://qt.nokia.com/products}{see more}
+            \endlist
+        \enddiv
+        \div {sectionlist normallist}
             \div {heading}
-              Qt API 
-	    \enddiv
-            \div {indexboxcont indexboxbar }
-              \div {sectionlist tricol}
-                \list
-                    \o \l{All Classes}{All Classes}
-                    \o \l{All Functions}{All Functions}
-                    \o \l{All Modules}{All Modules}
-                    \o \l{All Namespaces}{All Namespaces}
-                    \o \l{Global Qt Declarations}{Global Declarations}
-                    \o \l{Qt Licenses and Credits}{Licenses and Credits}
-                \endlist
-              \enddiv
-              \div {sectionlist  tricol}
-                \list
-                    \o \l{Programming with Qt}
-                    \o \l{UI Design with Qt}
-                    \o \l{Cross-Platform and Platform-Specific Development}
-                    \o \l{Qt and Key Technologies}
-                    \o \l{Best Practice Guides}
-                \endlist
-              \enddiv
-              \div {sectionlist}
-                \list
-                    \o \l{qtquick.html}{Qt Quick}
-                    \o \l{qdeclarativeintroduction.html}{Introduction to QML}
-                    \o \l{qdeclarativeelements.html}{QML Elements}
-                    \o \l{qdeclarativeexamples.html}{QML Examples and Demos}
-                \endlist
-              \enddiv
+                \l Develop with Qt
             \enddiv
-          \enddiv
-          \div {indexbox tools}
+            \image qml.png
+            \list
+            \o \l{Develop with Qt}{Steps to Programming Qt Applications}
+            \o \l{qt-creator-configure-target}{Configure Qt and Creator for Platforms}
+            \o \l{qt-technologies}{Qt Features and Technologies}
+            \o \l{qt-ui-creation}{Create UI with Qt}
+            \o \l{qt-utilities}{Utilities and Testing}
+            \o \l{qt-deployment}{Deploying Applications and Publish to Ovi Store}
+            \endlist
+
+            \list
+            \o \l Kevin's ABC
+            \endlist
+
+        \enddiv
+        \div {sectionlist normallist}
+            \div {heading}
+                \l See Qt
+            \enddiv
+            \image mobile.png
+            \list
+            \o \l{Qt Demonstrations}{Application Gallery}
+            \o \l{Tutorials}
+            \o \l{Qt Examples}{Examples}
+            \o \l{QML Examples and Demos}
+            \endlist
+        \enddiv
+    \enddiv
+\enddiv
+\div {indexbox tools}
+    \div {heading}
+        Reference
+    \enddiv
+    \div {indexboxcont indexboxbar}
+        \div {sectionlist normallist}
+            \div {heading}
+                Qt API
+            \enddiv
+            \list
+            \o \l{All Classes}{All Classes}
+            \o \l{All Functions}{All Functions}
+            \o \l{All Modules}{All Modules}
+            \o \l{All Namespaces}{All Namespaces}
+            \o \l{Global Qt Declarations}{Global Declarations}
+            \o \l{Qt Licenses and Credits}{Licenses and Credits}
+            \endlist
+        \enddiv
+        \div {sectionlist normallist}
+            \div {heading}
+                Qt Quick and Mobility
+            \enddiv
+            \list
+            \o \l{Intro to Qt Quick}{Introduction to Qt Quick}
+            \o \l{QML Elements}
+            \o \l{QML Examples and Demos}
+            \o \l{Qt Quick}{see more}
+            \endlist
+            \list
+            \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/index.html}{Qt Mobility APIs}
+            \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+            \endlist
+        \enddiv
+        \div {sectionlist normallist}
             \div {heading}
-              Qt Tools 
-	    \enddiv
-            \div {indexboxcont}
-              \div {section indexIcon} \emptyspan
-	      \enddiv
-              \div {section}
-                Qt offers a selection of development tools for
-                different tasks. Use Qt Creator for project and code
-                management as well as building powerfull UIs.
-              \enddiv
-              \div {section sectionlist}
-                \list
-                  \o \l{http://doc.qt.nokia.com/qtcreator-2.0/index.html}{Qt Creator}
-                  \o \l{designer-manual.html}{Qt Designer}
-                  \o \l{linguist-manual.html}{Qt Linguist}
-                  \o \l{assistant-manual.html}{Qt Assistant}
-                  \o \l{qmake-manual.html}{Qt qmake}
-                  \o \l{http://doc.qt.nokia.com/qtsimulator-1.0/index.html}{Qt Simulator}
-                  \o \l{http://qt.nokia.com/developer/eclipse-integration}{Eclipse Integration}
-                  \o \l{http://qt.nokia.com/products/appdev}{Add-On Products and Services}
-                  \o \l{qvfb.html}{Virtual Framebuffer}
-                \endlist
-              \enddiv
+                Qt Tools
             \enddiv
-          \enddiv
+            \list
+            \o \l{http://doc.qt.nokia.com/qtcreator-2.0/index.html}{Qt Creator}
+            \o \l{http://doc.qt.nokia.com/qtsimulator/index.html}{Qt Simulator}
+            \o \l{linguist-manual.html}{Qt Linguist}
+            \o \l{assistant-manual.html}{Qt Assistant}
+            \o \l{http://qt.nokia.com/products/appdev}{Add-On Products and Services}
+            \endlist
+        \enddiv
+    \enddiv
+\enddiv
 */
diff --git a/doc/src/mainpage.qdoc b/doc/src/mainpage.qdoc
new file mode 100644
index 0000000..a8ab995
--- /dev/null
+++ b/doc/src/mainpage.qdoc
@@ -0,0 +1,224 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page gettingstarted-develop.html
+    \title Develop with Qt
+    \ingroup gettingstarted
+
+\div {indexboxcont indexboxbar}
+Developing a Qt application involves many different steps and stages. From
+configuring Creator to distributing binaries to different platforms, Qt provides
+many options along the way.
+\image quick_screens.png
+\enddiv
+
+\div {indexboxcont indexboxbar normallist}
+\keyword qt-creator-configure-target
+\section1 Configuring Qt and Creator Targets
+Qt and Creator are configurable to compile applications on many platform targets
+and multiple platforms.
+
+\section2 Configuring Creator for Qt Development:
+Creator is the integrated development environment for developing Qt applications.
+Creator encompasses every step of application development from interface design
+to application testing and deployment.
+\list
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-project-managing.html}{Creating Qt Projects}
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-building-running.html}{Building and Running Applications}
+    \list
+    \o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-running-targets.html}{Targets} - edit and set compiler targets
+    \o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-build-settings.html}{Build Settings} - edit and set build configurations
+    \o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-run-settings.html}{Run Settings} - edit and set application run settings
+    \endlist
+\endlist
+\section2 Qt Platform Support
+Alternatively, Qt may be installed on its own without the Nokia Qt SDK.
+
+Information regarding Qt Support on Different Platforms:
+\list
+\o \l{Installing Qt for the Symbian platform}{Symbian and Mobile Development}
+\o \l{Support for Windows}{Microsoft Windows}
+\o \l{Support for Windows CE and Windows Mobile}{Microsoft Windows CE}
+\o \l{Support for Mac}{Apple Mac OS X}
+\o \l{Support for Linux/X11}{Linux and X11 Platforms}
+\o \l{Support for Embedded Linux}{Qt for Embedded Linux}
+\endlist
+For more information about the platforms supported
+and their installation pages, view the \l {Supported Platforms} and the
+\l {Cross-Platform and Platform-Specific Development} pages.
+\enddiv
+
+\div {indexboxcont indexboxbar normallist}
+\keyword qt-technologies
+\section1 Qt Technologies
+
+Qt introduces an innovative alternative for inter-object communication, called
+“signals and slots”, that replaces the old and unsafe callback technique used in
+many legacy frameworks. Qt also provides a conventional event model for handling
+mouse clicks, key presses, and other user input. Qt’s cross-platform GUI
+applications can support all the user interface functionality required by modern
+applications, such as menus, context menus, drag and drop, and dockable
+toolbars. Desktop integration features provided by Qt can be used to extend
+applications into the surrounding desktop environment, taking advantage of some
+of the services provided on each platform.
+
+The \l{All Modules}{Qt Modules} page has a listing of the technology modules offered by Qt.
+
+\keyword qt-desktop-meta-object-system
+\section2 Qt's Meta-Object System
+Qt offers a unique event system based on meta-objects, signals and slots, and property systems.
+\list
+\o \l{The Meta-Object System}{Qt's Meta-Object System} - Qt's mechanism for signals and slots, inter-object communication, run-time type information, and dynamic property system
+\o \l{The Event System}{Event System} - event handling and delivery
+\o \l{The Property System}{Property System} - dynamic object properties
+\endlist
+
+\keyword qt-ui-creation
+\section2 UI Creation
+Qt offers several options with regards to user interface creation: widget based
+applications using layouts and Qt Quick interfaces with QML.
+\list
+\o \l{Qt Quick} - create UIs using QML
+    \list
+    \o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-visual-editor.html}{Creator's QML Design Mode} - design Qt Quick interfaces using Creator's design mode
+    \endlist
+\o \l{Widgets and Layouts} - primary elements for C++ based interfaces
+    \list
+    \o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-using-qt-designer.html}{Creator's Designer} - design interfaces using Qt Designer.
+    \endlist
+\o \l{UI Design with Qt} - covers many Qt features for UI creation
+\endlist
+
+\section2 Inter-Process Communication, Threading, and Networking
+In addition to \l{qt-desktop-meta-object-system}{Qt's Meta-Object System}, Qt has several technologies
+that deal with inter-process communication.
+\list
+\o \l{Inter-Process Communication in Qt}{Inter-Process Communication} - various overviews of protocols implemented in Qt
+\o \l{Network programming with Qt}{Network Programming} - various overviews to network APIs
+\o \l{D-Bus} -  D-Bus implementation in Qt
+\o \l{Thread Support in Qt}{Thread Support} - overview of threading APIs and concurrent programming topics
+\endlist
+
+\section2 Rendering and Paint System
+Qt has various support for different rendering and painting methods.
+\list
+\o \l{Coordinate System} - Information about the coordinate system used by the paint system
+\o \l{Graphics View Framework} - manages a large number of 2D items and visualizes the items
+\o \l{Paint System} - A system for painting on the screen or on print devices using the same API
+\o \l{QtSvg Module} - module for displaying and creating SVG files
+\o Rendering APIs:
+    \list
+    \o \l{QtOpenGL Module} - module for rendering with the OpenGL API
+    \o \l{OpenVG Rendering in Qt}{QtOpenVG Module} - provides support for OpenVG painting
+    \endlist
+\o \l{Printing with Qt} - A guide to producing printed output with Qt's paint system and widgets.
+\endlist
+
+\keyword qt-webkit
+\section2 QtWebKit Module
+Web applications are increasing in importance and abundance and Qt has
+\l{http://www.webkit.org/}{WebKit} support.
+\list
+\o \l{WebKit in Qt} - WebKit Module
+\endlist
+
+\keyword qt-utilities
+\section2 Utilities
+Qt supports many utilities that work on multiple platforms.
+\list
+\o \l{Container Classes}{Containers} - Qt's implementation of various data structures such as linked lists and hash maps
+\o \l{Rich Text Processing} - for manipulating structured rich text documents
+\o \l{XML Processing} - high level manipulation of XML data using different interfaces
+\o \l{Making Applications Scriptable} - provides Qt applications with ECMAScript processor.
+\o \l{Qt Linguist Manual}{Qt Linguist} - for translating applications into local languages.
+\endlist
+For more information, visit the \l{Qt's Tools}{Qt Tools} page.
+\section1 Testing Qt Applications
+Testing and debugging are part of the development process and Qt offers the
+developer multiple methods of testing their code.
+\list
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-debugging.html} {Debugging Applications in Creator} - various debugging options in Creator
+\o \l {http://doc.qt.nokia.com/qtsimulator/index.html}{Simulator} - testing mobile applications by simulating a mobile environment
+\o \l {QML Viewer} - an executable that is able to run QML files
+\o \l{QTestLib Manual}{QTestLib} - a unit testing framework built into Qt
+\endlist
+\enddiv
+
+\div {indexboxcont indexboxbar normallist}
+\keyword qt-deployment
+\section1 Deployment
+Symbian phones, Maemo devices, desktop environments, embedded Linux devices -- Qt applications are deployable to many environments.
+To deploy Qt applications onto multiple platforms, there are special
+considerations that each platform introduce.
+\list
+\o \l{Deploying Qt Applications}{Deploying Qt Libraries} - compares static versus shared libraries and deploying Qt libraries
+\o \l{Deploying Qt Applications#licensing}{Deploying Third Party Libraries} - deployment of libraries that are not under Qt's dual-license model.
+\o Platform-Specific Deployment:
+    \list
+    \o \l{Deploying an Application on X11 Platforms}{X11} - deploying Qt applications on X11 platforms
+    \o \l{Deploying an Application on Windows}{Windows} - deploying Qt applications on Windows operating systems
+    \o \l{Deploying an Application on Mac OS X}{Mac OS X} - deploying Qt applications on Mac OS X
+    \o \l{Deploying Qt for Embedded Linux Applications}{Embedded Linux} - deploying Qt applications on embedded Linux
+    \o \l{Deploying an Application on the Symbian Platform}{Symbian} - deploying Qt applications on the Symbian platform
+    \endlist
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-deployment-symbian.html}{Symbian Deployment in Creator} - Symbian application deployment built into Creator
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-deployment-maemo.html}{ Deploying Qt Applications on Maemo Devices}
+\endlist
+
+\section1 Ovi Store Publishing
+Creator can publish applications to Ovi Store directly.
+\list
+\o \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-publish-ovi.html}{Publishing Qt Applications to Ovi Store}
+\endlist
+For additional information, visit the \l{Cross-Platform and Platform-Specific Development}
+and the \l {Supported Platforms} page.
+
+\enddiv
+\div {indexboxcont indexboxbar normallist}
+\section1 Where to Go from Here
+
+Qt Demos and Examples
+\list
+\o \l{Qt Demonstrations}{Application Gallery}
+\o \l{Tutorials}
+\o \l {Qt Examples}
+\o \l {QML Examples and Demos}
+\endlist
+
+Qt Information
+\list
+\o \l{Programming with Qt}
+\o \l{UI Design with Qt}
+\o \l{Cross-platform and Platform-specific Development}
+\o \l{Qt and Key Technologies}
+\o \l{Best Practice Guides}
+\endlist
+\enddiv
+*/
+
+
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index a1a9f42..4cb8fef 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1382,6 +1382,10 @@
         font: normal bold 13px/1 Verdana;
     }
 
+    .content .normallist li
+    {
+        font: normal 13px/1 Verdana;
+    }
     .indexbox a:hover, .indexbox a:visited:hover
     {
         color: #4c0033;
@@ -1418,6 +1422,13 @@
         background: url(../images/sprites-combined.png) no-repeat -111px -376px;
         padding: 0;
     }
+    .indexbox.tools .indexIcon2
+    {
+        width: 115px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
+        padding: 0;
+    }
     .indexboxcont:after
     {
         content: ".";