Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/text/qtextoption.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtGui module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     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.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    118118    if (this == &o)
    119119        return *this;
    120     delete d; d = 0;
     120
     121    QTextOptionPrivate* dNew = 0;
     122    if (o.d)
     123        dNew = new QTextOptionPrivate(*o.d);
     124    delete d;
     125    d = dNew;
     126
    121127    align = o.align;
    122128    wordWrap = o.wordWrap;
     
    126132    f = o.f;
    127133    tab = o.tab;
    128     if (o.d)
    129         d = new QTextOptionPrivate(*o.d);
    130134    return *this;
    131135}
     
    198202    properties.
    199203
    200     \ingroup text
     204    \ingroup
    201205
    202206    QTextOption is used to encapsulate common rich text properties in a single
     
    342346    This enum holds the different types of tabulator
    343347
    344     \value LeftTab,     A left-tab
    345     \value RightTab,    A right-tab
    346     \value CenterTab,   A centered-tab
     348    \value LeftTab     A left-tab
     349    \value RightTab    A right-tab
     350    \value CenterTab   A centered-tab
    347351    \value DelimiterTab A tab stopping at a certain delimiter-character
    348352*/
Note: See TracChangeset for help on using the changeset viewer.