diff options
Diffstat (limited to 'src/gui/text/qtextoption.cpp')
-rw-r--r-- | src/gui/text/qtextoption.cpp | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 87e31eeb2c..2a16f50f33 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -144,7 +144,7 @@ QTextOption &QTextOption::operator=(const QTextOption &o) Sets the tab positions for the text layout to those specified by \a tabStops. - \sa tabArray(), setTabStop(), setTabs() + \sa tabArray(), setTabStopDistance(), setTabs() */ void QTextOption::setTabArray(const QList<qreal> &tabStops) { @@ -332,22 +332,45 @@ QList<QTextOption::Tab> QTextOption::tabs() const \sa flags() */ +#if QT_DEPRECATED_SINCE(5, 10) /*! \fn qreal QTextOption::tabStop() const + \deprecated in Qt 5.10. Use tabStopDistance() instead. Returns the distance in device units between tab stops. Convenient function for the above method - \sa setTabStop(), tabArray(), setTabs(), tabs() + \sa setTabStopDistance(), tabArray(), setTabs(), tabs() */ /*! \fn void QTextOption::setTabStop(qreal tabStop) + \deprecated in Qt 5.10. Use setTabStopDistance() instead. Sets the default distance in device units between tab stops to the value specified by \a tabStop. - \sa tabStop(), setTabArray(), setTabs(), tabs() + \sa tabStopDistance(), setTabArray(), setTabs(), tabs() +*/ +#endif + +/*! + \fn qreal QTextOption::tabStopDistance() const + \since 5.10 + + Returns the distance in device units between tab stops. + + \sa setTabStopDistance(), tabArray(), setTabs(), tabs() +*/ + +/*! + \fn void QTextOption::setTabStopDistance(qreal tabStopDistance) + \since 5.10 + + Sets the default distance in device units between tab stops to the value specified + by \a tabStopDistance. + + \sa tabStopDistance(), setTabArray(), setTabs(), tabs() */ /*! @@ -426,7 +449,7 @@ QList<QTextOption::Tab> QTextOption::tabs() const \fn void setTabs(const QList<Tab> &tabStops) Set the Tab properties to \a tabStops. - \sa tabStop(), tabs() + \sa tabStopDistance(), tabs() */ /*! @@ -434,7 +457,7 @@ QList<QTextOption::Tab> QTextOption::tabs() const \fn QList<QTextOption::Tab> QTextOption::tabs() const Returns a list of tab positions defined for the text layout. - \sa tabStop(), setTabs(), setTabStop() + \sa tabStopDistance(), setTabs(), setTabStop() */ |