Changeset 846 for trunk/doc/src/windows-and-dialogs

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/windows-and-dialogs/dialogs.qdoc (modified) (4 diffs)
• doc/src/windows-and-dialogs/mainwindow.qdoc (modified) (5 diffs)

trunk/doc/src/windows-and-dialogs/dialogs.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:L$
 ** 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
+** 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
@@ -42 +28 @@
 /*!
     \group standard-dialogs
-    \title Standard Dialog Classes
-*/
-
-/*!
-    \group dialog-classes
-    \title Classes for Building Dialogs
+    \ingroup qt-gui-concepts
+    \title Standard Dialogs
+    \brief A list of Qt classes for implementing standard dialogs. 
 */
 
@@ -53 +36 @@
     \page dialogs.html
     \title Dialog Windows
+
     \brief An overview over dialog windows.
     
-    \previouspage The Application Main Window
+    \previouspage Application Main Window
     \contentspage Application Windows and Dialogs
     \nextpage Desktop Integration

trunk/doc/src/windows-and-dialogs/mainwindow.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:L$
 ** 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.
-**
-** 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.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
@@ -47 +33 @@
 /*!
     \page application-windows.html
-    \title Application Windows and Dialogs
-    \ingroup frameworks-technologies
-
-    \nextpage The Application Main Window
+    \title Window and Dialog Widgets
+    \brief Windows and Dialogs in Qt.
+    \ingroup qt-gui-concepts
 
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
@@ -82 +67 @@
     \section1 Main Windows and Dialogs
 
-    \l{The Application Main Window} provides the framework for building the
+    Application Main Window} provides the framework for building the
     application's main user interface, and are created by subclassing QMainWindow.
     QMainWindow has its own layout to which you can add a \l{QMenuBar}{menu bar},
@@ -165 +150 @@
 /*!
     \page mainwindow.html
-    \title The Application Main Window
-    \brief Everything you need for a typical modern main application window,
-    including menus, toolbars, workspace, etc.
-
-    \contentspage Application Windows and Dialogs
-    \nextpage Dialog Windows
+    \title Application Main Window
+    \ingroup qt-gui-concepts
+    \brief Creating the application window.
 
     \tableofcontents