Changeset 846 for trunk/src/gui/text/qtextoption.cpp

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)
• src/gui/text/qtextoption.cpp (modified) (5 diffs)

trunk/src/gui/text/qtextoption.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -66 +66 @@
       d(0)
 {
-    direction = QApplication::layoutDirection();
+    direction = Qt::LayoutDirectionAuto;
 }
 
@@ -146 +146 @@
     \sa tabArray(), setTabStop(), setTabs()
 */
-void QTextOption::setTabArray(QList<qreal> tabStops)
+void QTextOption::setTabArray(QList<qreal> tabStops) // Qt5: const ref
 {
     if (!d)
@@ -166 +166 @@
     \sa tabStops()
 */
-void QTextOption::setTabs(QList<QTextOption::Tab> tabStops)
+void QTextOption::setTabs(QList<QTextOption::Tab> tabStops) // Qt5: const ref
 {
     if (!d)
@@ -392 +392 @@
 
 /*!
+    \fn Tab::Tab(qreal pos, TabType tabType, QChar delim = QChar())
+    
+    Creates a tab with the given position, tab type, and delimiter
+    (\a pos, \a tabType, \a delim).
+
+    \note \a delim is only used when \a tabType is DelimiterTab.
+
+    \since 4.7
+*/
+
+/*!
     \fn bool Tab::operator==(const Tab &other) const