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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/doc/src/painting-and-printing/coordsys.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    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
    … …  
    4228/*!
    4329    \page coordsys.html
    44     \title The Coordinate System
     30    \title Coordinate System
     31    \ingroup qt-graphics
    4532    \brief Information about the coordinate system used by the paint
    4633    system.
    47 
    48     \previouspage Drawing and Filling
    49     \contentspage The Paint System
    50     \nextpage Reading and Writing Image Files
    5134
    5235    The coordinate system is controlled by the QPainter

  • trunk/doc/src/painting-and-printing/paintsystem.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    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.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    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.
     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
    … …  
    6147/*!
    6248    \page paintsystem.html
    63     \title The Paint System
     49    \title Paint System
     50    \brief A system for painting on the screen or on print devices using the same API
     51    \ingroup qt-graphics
    6452    \ingroup frameworks-technologies
     53    \ingroup qt-basic-concepts
     54       
    6555
    6656    Qt's paint system enables painting on screen and print devices
    … …  
    8878        \o \l{Paint Devices and Backends}
    8979        \o \l{Drawing and Filling}
    90         \o \l{The Coordinate System}
     80        \o \l{Coordinate System}
    9181        \o \l{Reading and Writing Image Files}
    9282        \o \l{Styling}
    … …  
    286276    \previouspage Paint Devices and Backends
    287277    \contentspage The Paint System
    288     \nextpage The Coordinate System
     278    \nextpage Coordinate System
    289279
    290280    \section1 Drawing
    … …  
    338328    Normally, QPainter draws in a "natural" coordinate system, but it
    339329    is able to perform view and world transformations using the
    340     QTransform class. For more information, see \l {The Coordinate
    341     System} documentation which also describes the rendering process,
    342     i.e. the relation between the logical representation and the
    343     rendered pixels, and the benefits of anti-aliased painting.
     330    QTransform class. For more information, see \l {Coordinate
     331    System}, which also describes the rendering process, i.e. the
     332    relation between the logical representation and the rendered
     333    pixels, and the benefits of anti-aliased painting.
    344334
    345335    \table 100%
    … …  
    408398    \title Reading and Writing Image Files
    409399
    410     \previouspage The Coordinate System
     400    \previouspage Coordinate System
    411401    \contentspage The Paint System
    412402    \nextpage Styling
    … …  
    567557   
    568558    For more information about widget styling and appearance, see the
    569     documentation about \l{Implementing Styles and Style Aware Widgets}.
    570 */
     559    \l{Styles and Style Aware Widgets}.
     560*/

  • trunk/doc/src/painting-and-printing/printing.qdoc

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    77** This file is part of the documentation of the Qt Toolkit.
    88**
    9 ** $QT_BEGIN_LICENSE:LGPL$
     9** $QT_BEGIN_LICENSE:FDL$
    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.
     13** Software or, alternatively, in accordance with the terms contained in a
     14** written agreement between you and Nokia.
    1515**
    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.
     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
    … …  
    5036  \page printing.html
    5137  \title Printing with Qt
     38  \ingroup qt-graphics
    5239
    5340  \previouspage Styling
    … …  
    150137  QPaintDevice argument.
    151138
     139  \section1 Printing Widgets
     140
     141  To print a widget, you can use the QWidget::render() function. As mentioned,
     142  the printer's resolution is usually higher than the screen resolution, so you
     143  will have to scale the painter. You may also want to position the widget on the
     144  page. The following code sample shows how this may look.
     145
     146  \snippet doc/src/snippets/widgetprinting.cpp 0
     147
     148  This will center the widget on the page and scale it so that it fits the page.
     149
    152150  \section1 Printing from Complex Widgets
    153151
Note: See TracChangeset for help on using the changeset viewer.