summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/snippets/code
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-07 01:00:20 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-07 01:00:21 +0200
commit295cd87c6d4cb6c9c1222fc565031377e5f33704 (patch)
tree31296727d5fed266d5d894d57827c139cb555108 /src/corelib/doc/snippets/code
parent35ebdeb83eb4057f5e50042747b13d0772051459 (diff)
parent3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'src/corelib/doc/snippets/code')
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
index 0485bd290a..97453e2b06 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -49,6 +49,17 @@
****************************************************************************/
//! [0]
-qreal myEasingFunction(qreal progress);
+ QEasingCurve easing(QEasingCurve::InOutQuad);
+
+ for (qreal t = 0.0; t < 1.0; t+=0.1)
+ qWarning() << "Effective progress" << t << " is
+ << easing.valueForProgress(t);
//! [0]
+//! [1]
+ QPropertyAnimation animation;
+ animation.setStartValue(0);
+ animation.setEndValue(1000);
+ animation.setDuration(1000);
+ animation.setEasingCurve(QEasingCurve::InOutQuad);
+//! [1]