##// 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: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2854:46147b040d06
r2893:0464d42b101e merge 5.7.0
Show More
chartview.h
55 lines | 1.8 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen
Add/modify license headers
r830 **
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.
Jani Honkonen
Add/modify license headers
r830 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Jani Honkonen
Add/modify license headers
r830
Jani Honkonen
Fix include issues
r1949 #ifndef CHARTVIEW_H
#define CHARTVIEW_H
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartGlobal>
#include <QtCharts/QChartView>
#include <QtCharts/QScatterSeries>
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
Tero Ahola
Tuned scatterinteractions example
r1026 class ChartView : public QChartView
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394 {
Q_OBJECT
public:
Tero Ahola
Tuned scatterinteractions example
r1026 ChartView(QWidget *parent = 0);
~ChartView();
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
private Q_SLOTS:
Jani Honkonen
more coding style fixes for examples...
r2102 void handleClickedPoint(const QPointF &point);
Tero Ahola
Clicked, remove and clear to QScatterSeries
r394
private:
QScatterSeries *m_scatter;
QScatterSeries *m_scatter2;
};
Jani Honkonen
Fix include issues
r1949 #endif // CHARTVIEW_H