Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:L$
    1010** Commercial Usage
    1111** Licensees holding valid Qt Commercial licenses may use this file in
    1212** accordance with the Qt Commercial License Agreement provided with the
    13 ** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
    15 **
    16 ** GNU Lesser General Public License Usage
    17 ** Alternatively, this file may be used under the terms of the GNU Lesser
    18 ** General Public License version 2.1 as published by the Free Software
    19 ** Foundation and appearing in the file LICENSE.LGPL included in the
    20 ** packaging of this file.  Please review the following information to
    21 ** ensure the GNU Lesser General Public License version 2.1 requirements
    22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    23 **
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
    26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    27 **
    28 ** GNU General Public License Usage
    29 ** Alternatively, this file may be used under the terms of the GNU
    30 ** General Public License version 3.0 as published by the Free Software
    31 ** Foundation and appearing in the file LICENSE.GPL included in the
    32 ** packaging of this file.  Please review the following information to
    33 ** ensure the GNU General Public License version 3.0 requirements will be
    34 ** met: http://www.gnu.org/copyleft/gpl.html.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
     15**
     16** GNU Free Documentation License
     17** Alternatively, this file may be used under the terms of the GNU Free
     18** Documentation License version 1.3 as published by the Free Software
     19** Foundation and appearing in the file included in the packaging of this
     20** file.
    3521**
    3622** If you have questions regarding the use of this file, please contact
     
    4733/*!
    4834    \page application-windows.html
    49     \title Application Windows and Dialogs
    50     \ingroup frameworks-technologies
    51 
    52     \nextpage The Application Main Window
     35    \title Window and Dialog Widgets
     36    \brief Windows and Dialogs in Qt.
     37    \ingroup qt-gui-concepts
    5338
    5439    A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     
    8267    \section1 Main Windows and Dialogs
    8368
    84     \l{The Application Main Window} provides the framework for building the
     69    Application Main Window} provides the framework for building the
    8570    application's main user interface, and are created by subclassing QMainWindow.
    8671    QMainWindow has its own layout to which you can add a \l{QMenuBar}{menu bar},
     
    165150/*!
    166151    \page mainwindow.html
    167     \title The Application Main Window
    168     \brief Everything you need for a typical modern main application window,
    169     including menus, toolbars, workspace, etc.
    170 
    171     \contentspage Application Windows and Dialogs
    172     \nextpage Dialog Windows
     152    \title Application Main Window
     153    \ingroup qt-gui-concepts
     154    \brief Creating the application window.
    173155
    174156    \tableofcontents
Note: See TracChangeset for help on using the changeset viewer.