Changeset 561 for trunk/src/gui/text/qtextoption.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/gui/text/qtextoption.cpp
r2 r561 2 2 ** 3 3 ** 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]) 5 6 ** 6 7 ** This file is part of the QtGui module of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 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. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you 37 ** @nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 118 118 if (this == &o) 119 119 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 121 127 align = o.align; 122 128 wordWrap = o.wordWrap; … … 126 132 f = o.f; 127 133 tab = o.tab; 128 if (o.d)129 d = new QTextOptionPrivate(*o.d);130 134 return *this; 131 135 } … … 198 202 properties. 199 203 200 \ingroup text204 \ingroup 201 205 202 206 QTextOption is used to encapsulate common rich text properties in a single … … 342 346 This enum holds the different types of tabulator 343 347 344 \value LeftTab ,A left-tab345 \value RightTab ,A right-tab346 \value CenterTab ,A centered-tab348 \value LeftTab A left-tab 349 \value RightTab A right-tab 350 \value CenterTab A centered-tab 347 351 \value DelimiterTab A tab stopping at a certain delimiter-character 348 352 */
Note:
See TracChangeset
for help on using the changeset viewer.