Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

20 files changed, 78 insertions, 22 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ed8b734..e1c9473 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -28,6 +28,8 @@
 /*!
 \title Qt Quick
 \page qtquick.html
+\ingroup qt-gui-concepts
+
 
 \brief Qt Quick provides a declarative framework for building highly
 dynamic, custom user interfaces.
@@ -88,11 +90,11 @@ Module.
 \o \l{QML Modules}
 \o \l{Extending types from QML}
 \o \l{Dynamic Object Management in QML}
-\o \l{Qt Declarative UI Runtime}
 \endlist
 
 \section1 Using QML with C++
 \list
+\o \l{Qt Declarative UI Runtime}
 \o \l{Using QML in C++ Applications}
 \o \l{Integrating QML with existing Qt UI code}
 \o \l{Tutorial: Writing QML extensions with C++}
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index f28337d..0c07747 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -31,6 +31,8 @@
     \brief An overview of Qt's unit testing framework.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
     \keyword qtestlib
 
     The QTestLib framework, provided by Nokia, is a tool for unit
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 4134cfe..cbc1558 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -36,6 +36,7 @@
     \brief How to make your applications accessible to those with disabilities.
 
     \ingroup technology-apis
+    \ingroup qt-basic-concepts
     \ingroup best-practices
 
     \tableofcontents
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 797326e..cf5fe73 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -46,6 +46,7 @@
     \title Container Classes
     \ingroup technology-apis
     \ingroup groups
+    \ingroup qt-basic-concepts
     \keyword container class
     \keyword container classes
 
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 7147823..20bb750 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -34,6 +34,8 @@
     \page graphicsview.html
     \title Graphics View Framework
     \ingroup qt-graphics
+    \ingroup qt-basic-concepts
+	
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc
index 26a8cec..775243a 100644
--- a/doc/src/frameworks-technologies/ipc.qdoc
+++ b/doc/src/frameworks-technologies/ipc.qdoc
@@ -31,6 +31,7 @@
     \brief Inter-Process communication in Qt applications.
 
     \ingroup technology-apis
+    \ingroup qt-basic-concepts
     \ingroup qt-network
 
     Qt provides several ways to implement Inter-Process Communication
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7167f97..7a1fb40 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -32,6 +32,7 @@
 
 /*!
     \page model-view-programming.html
+	\ingroup qt-basic-concepts
 
     \title Model/View Programming
     \brief A guide to Qt's extensible model/view architecture.
diff --git a/doc/src/frameworks-technologies/plugins-howto.qdoc b/doc/src/frameworks-technologies/plugins-howto.qdoc
index a66bae0..5103bdc 100644
--- a/doc/src/frameworks-technologies/plugins-howto.qdoc
+++ b/doc/src/frameworks-technologies/plugins-howto.qdoc
@@ -47,6 +47,8 @@
     functionality provided by Qt.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
 
     \keyword QT_DEBUG_PLUGINS
     \keyword QT_NO_PLUGIN_CHECK
diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc
index 42a57ec..a9ee0b2 100644
--- a/doc/src/frameworks-technologies/richtext.qdoc
+++ b/doc/src/frameworks-technologies/richtext.qdoc
@@ -36,7 +36,8 @@
     \brief An overview of Qt's rich text processing, editing and display features.
 
     \ingroup frameworks-technologies
-
+    \ingroup qt-basic-concepts
+	
     \nextpage Rich Text Document Structure
 
     The Scribe framework provides a set of classes for reading and manipulating
diff --git a/doc/src/howtos/openvg.qdoc b/doc/src/howtos/openvg.qdoc
index cabd8f7..dc7a34a 100644
--- a/doc/src/howtos/openvg.qdoc
+++ b/doc/src/howtos/openvg.qdoc
@@ -30,6 +30,8 @@
     \title OpenVG Rendering in Qt
     \since 4.6
     \ingroup best-practices
+    \ingroup technology-apis
+
 
     \brief Efficient rendering on embedded devices with OpenVG
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 2272cf8..e45892f 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -52,34 +52,33 @@
           </div>
           <div class="indexbox api">
             <div class="heading">
-              Qt API Overviews</div>
+              Qt API</div>
             <div class="indexboxcont indexboxbar ">
               <div class="sectionlist tricol">
                 <ul>
-                    <li><a href="classes.html">Class index</a></li>
-                    <li><a href="functions.html">Function index</a></li>
-                    <li><a href="modules.html">Modules</a></li>
-                    <li><a href="namespaces.html">Namespaces</a></li>
+                    <li><a href="classes.html">All Classes</a></li>
+                    <li><a href="functions.html">All Functions</a></li>
+                    <li><a href="modules.html">All Modules</a></li>
+                    <li><a href="namespaces.html">All Namespaces</a></li>
                     <li><a href="qtglobal.html">Global Declarations</a></li>
+                    <li><a href="licensing.html">Licenses and Credits</a></li>
                 </ul>
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-                    <li><a href="qt-basic-concepts.html">Basic Concepts</a></li>
-                    <li><a href="qt-gui-concepts.html">GUI Components</a></li>
+                    <li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
+                    <li><a href="qt-gui-concepts.html">UI Design with Qt</a></li>
                     <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li>
-                    <li><a href="technology-apis.html">Qt APIs for standard technologies </a></li>
-                    <li><a href="best-practices.html">How-To Guides and Best Practices</a></li>
-                </ul>
+                    <li><a href="technology-apis.html">Qt and Key Technologies</a></li>
+                    <li><a href="best-practices.html">Best Practices Guides</a></li>
+               </ul>
               </div>
               <div class="sectionlist">
                 <ul>
                     <li><a href="qtquick.html">Qt Quick</a></li>
                     <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
                     <li><a href="qdeclarativeelements.html">QML Elements</a></li>
-                    <li><a href="model-view-programming.html">Model/View Programming</a></li>
-                    <li><a href="qt-network.html">Network Programming</a></li>
-                    <li><a href="qt-graphics.html">Graphics and Printing</a></li>
+                    <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li>
                 </ul>
               </div>
             </div>
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 5d9c819..8b6e337 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -39,6 +39,8 @@
     \brief Information about Qt's support for internationalization and multiple languages.
     \nextpage Writing Source Code for Translation
 
+    \ingroup qt-basic-concepts
+	
     \keyword internationalization
     \keyword i18n
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 8912490..d3c33d9 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -152,6 +152,7 @@
     \module QtOpenGL
     \title QtOpenGL Module
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtOpenGL module offers classes that make it easy to
     use OpenGL in Qt applications.
@@ -202,6 +203,7 @@
     \title QtOpenVG Module
     \since 4.6
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtOpenVG module is a plugin that provides support for
     OpenVG painting.
@@ -352,6 +354,8 @@
         \title QtSvg Module
         \since 4.1
         \ingroup modules
+		\ingroup technology-apis
+		\ingroup best-practices
 
         \brief The QtSvg module provides classes for displaying and creating SVG files.
 
@@ -400,6 +404,7 @@
     \module QtXml
     \title QtXml Module
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtXml module provides a stream reader and writer for
     XML documents, and C++ implementations of SAX and DOM.
@@ -424,6 +429,7 @@
     \title QtXmlPatterns Module
     \since 4.4
     \ingroup modules
+	\ingroup technology-apis
 
     \brief The QtXmlPatterns module provides support for XPath,
     XQuery, XSLT and XML Schema validation.
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 1c35a63..2dd44f6 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -35,21 +35,21 @@
 
 /*!
     \group qt-basic-concepts
-    \title Basic Qt Architecture
+    \title Programming with Qt
 
     \brief The basic architecture of the Qt cross-platform application and UI framework.
 
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
-    operating systems. These pages explain basic architectural
-    concepts of Qt:
-
+    operating systems. This page contains links to articles and overviews
+	explaining key components and techniuqes used in Qt development.
+	
     \generatelist {related}
  */
 
 /*!
     \group qt-gui-concepts
-    \title Qt Desktop UI Components
+    \title UI Design with Qt
 
     \brief The Qt components for constructing native look & feel desktop UI's.
 
@@ -62,6 +62,7 @@
 
 /*!
     \group qt-graphics
+	\ingroup qt-basic-concepts
     \title Qt Graphics and Printing
 
     \brief The Qt components for doing graphics.
@@ -71,6 +72,7 @@
 
 /*!
     \group qt-network
+	\ingroup qt-basic-concepts
     \title Network programming with Qt
 
     \brief The these pages are about Qt's support for network programming.
@@ -80,7 +82,7 @@
 
 /*!
     \group technology-apis
-    \title Qt API's for other technologies
+    \title Qt and Key Technologies
 
     These pages document Qt's API's for some widely-used standards and
     technologies.
@@ -91,6 +93,7 @@
 /*!
   \group qt-activex
   \title ActiveX in Qt
+  \ingroup qt-basic-concepts
   \ingroup technology-apis
   \ingroup platform-specific
 
@@ -108,6 +111,8 @@
   \brief Qt API's for using SQL.
   \ingroup technology-apis
   \ingroup best-practices
+  \ingroup qt-basic-concepts
+  
 
   These pages document Qt's API's for using SQL database systems
   in Qt applications.
@@ -117,7 +122,7 @@
 
 /*!
     \group best-practices
-    \title How-To's and Best Practices
+    \title Best Practices Guides
 
     \brief How-To Guides and Best Practices
 
@@ -128,3 +133,16 @@
 
     \generatelist{related}
 */
+/*! 
+
+	\group licensing
+	\title Qt Licenses and Credits
+
+	\brief About the licenses used for Qt, and some credits to our contributors.
+
+	This page contains information on the different licenses Qt is shipped with,
+	and credits to some of our many contributers.
+
+	\generatelist {related}
+
+*/
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 4c6fd91..deb9c8b 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -50,6 +50,8 @@
     \brief A system for painting on the screen or on print devices using the same API
     \ingroup qt-graphics
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
 
     Qt's paint system enables painting on screen and print devices
     using the same API, and is primarily based on the QPainter,
diff --git a/doc/src/porting/qt4-mainwindow.qdoc b/doc/src/porting/qt4-mainwindow.qdoc
index 7d2a400..b160d63 100644
--- a/doc/src/porting/qt4-mainwindow.qdoc
+++ b/doc/src/porting/qt4-mainwindow.qdoc
@@ -28,7 +28,12 @@
 /*!
     \page qt4-mainwindow.html
     \title The Qt 4 Main Window Classes
+	\ingroup qt-basic-concepts
+    
+	\brief Overview of the Main Window concept and Classes
+	
 
+	
     \contentspage {What's New in Qt 4}{Home}
     \previouspage The Scribe Classes
     \nextpage The New Qt Designer
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 349048f..de5b0a0 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -203,6 +203,9 @@
       *border: 1px solid #fff;
       *height: 17px;
       _height: 18px;
+	  /* to be fixed */
+	  display: none;
+	  /* to be fixed */
     }
 
     .narrow .indexbox .indexIcon {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6f2bdce..9afff03 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1521,6 +1521,10 @@
 	.creator .toc {
 	margin:10px 20px 10px 10px;
 	}	
+	
+	.creator #narrowsearch, .creator #narrowmenu{
+		display:none;
+	}
 /* end of creator spec*/
 	
 }
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index d2687ea..32dddd7 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -33,6 +33,7 @@
 /*!
     \page layout.html
     \title Layout Management
+    \ingroup qt-basic-concepts
     \ingroup qt-gui-concepts
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 5c72570..cc36fa2 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -31,6 +31,7 @@
     \brief How to use style sheets to customize the appearance of widgets.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
 
     \previouspage {Styles and Style Aware Widgets}{Styles}
     \contentspage Widgets and Layouts