##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

File last commit:

r2854:46147b040d06
r2878:97bb01ce5d85 merge
Show More
chartanimation.cpp
55 lines | 1.7 KiB | text/x-c | CppLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555 **
Miikka Heikkinen
Updated license...
r2854 ** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen
Updated license...
r2854 ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555
Titta Heikkala
Fix include syntax...
r2714 #include <private/chartanimation_p.h>
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555
ChartAnimation::ChartAnimation(QObject *parent) :
QVariantAnimation(parent),
m_destructing(false)
{
}
void ChartAnimation::stopAndDestroyLater()
{
m_destructing = true;
stop();
deleteLater();
}
void ChartAnimation::startChartAnimation()
{
if (!m_destructing)
start();
}
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Miikka Heikkinen
Fix resetting animation options mid-animation....
r2555