diff options
Diffstat (limited to 'src/widgets/util/qscroller.cpp')
| -rw-r--r-- | src/widgets/util/qscroller.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 870d56fcb7..7ad726228d 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -7,29 +7,29 @@ ** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -401,7 +401,7 @@ void QScroller::setScrollerProperties(const QScrollerProperties &sp) internal states of the widget that received the original mouse press are consistent. - \sa ungrabGesture, grabbedGesture + \sa ungrabGesture(), grabbedGesture() */ Qt::GestureType QScroller::grabGesture(QObject *target, ScrollerGestureType scrollGestureType) { @@ -445,7 +445,7 @@ Qt::GestureType QScroller::grabGesture(QObject *target, ScrollerGestureType scro Returns the gesture type currently grabbed for the \a target or 0 if no gesture is grabbed. - \sa grabGesture, ungrabGesture + \sa grabGesture(), ungrabGesture() */ Qt::GestureType QScroller::grabbedGesture(QObject *target) { @@ -460,7 +460,7 @@ Qt::GestureType QScroller::grabbedGesture(QObject *target) Ungrabs the gesture for the \a target. Does nothing if no gesture is grabbed. - \sa grabGesture, grabbedGesture + \sa grabGesture(), grabbedGesture() */ void QScroller::ungrabGesture(QObject *target) { @@ -723,7 +723,7 @@ void QScroller::scrollTo(const QPointF &pos, int scrollTime) This function performs the actual scrolling by calling scrollTo(). - \sa scrollTo + \sa scrollTo() */ void QScroller::ensureVisible(const QRectF &rect, qreal xmargin, qreal ymargin) { |