Changeset 846 for trunk/doc/src/overviews.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/overviews.qdoc (modified) (4 diffs)

trunk/doc/src/overviews.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
@@ -49 +35 @@
 
 /*!
-    \group frameworks-technologies
-    \title Frameworks and Technologies
+    \group qt-basic-concepts
+    \title Programming with Qt
 
-    \brief Documentation about the frameworks and technologies in Qt
+    \brief The basic architecture of the Qt cross-platform application and UI framework.
 
-    These documents dive into the frameworks of classes that Qt provides,
-    and provide background information about the technical solutions used
-    in Qt's architecture.
+    Qt is a cross-platform application and UI framework for writing
+    web-enabled applications for desktop, mobile, and embedded
+    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 UI Design with Qt
+
+    \brief The Qt components for constructing native look & feel desktop UI's.
+
+    These pages are about Qt's traditional set of GUI components for
+    building both native look & feel and custom UI's for the desktop
+    environment. Use \l{Qt Quick} for building UI's for mobile devices.
+
+    \generatelist {related}
+ */
+
+/*!
+    \group qt-graphics
+        \ingroup qt-basic-concepts
+    \title Qt Graphics and Printing
+
+    \brief The Qt components for doing graphics.
+
+    \generatelist {related}
+ */
+
+/*!
+    \group qt-network
+        \ingroup qt-basic-concepts
+    \title Network programming with Qt
+
+    \brief The these pages are about Qt's support for network programming.
+
+    \generatelist {related}
+ */
+
+/*!
+    \group technology-apis
+    \title Qt and Key Technologies
+
+    These pages document Qt's API's for some widely-used standards and
+    technologies.
 
     \generatelist{related}
@@ -62 +92 @@
 
 /*!
+  \group qt-activex
+  \title ActiveX in Qt
+  \ingroup qt-basic-concepts
+  \ingroup technology-apis
+  \ingroup platform-specific
+
+  \brief Qt API's for using ActiveX controls, servers, and COM.
+
+  These pages document Qt's API's for developing with ActiveX
+  controls, servers, and COM.
+
+  \generatelist{related}
+*/
+
+/*!
+  \group qt-sql
+  \title SQL in Qt
+  \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.
+
+  \generatelist{related}
+*/
+
+/*!
     \group best-practices
-    \title How-To's and Best Practices
+    \title Best Practices Guides
 
     \brief How-To Guides and Best Practices
 
-    These documents provide guidelines and best practices explaining
-    how to use Qt to solve specific technical problems.
+    These documents provide guidelines and best practices for using Qt
+    to solve specific technical problems. They are listed
+    alphabetically by the first word in the title, so scan the entire
+    list to find what you want.
 
     \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}
+
+*/