##// 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/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2854:46147b040d06
r2898:03a6177a3223 merge master
Show More
qchartview_p.h
76 lines | 2.2 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
Updates chartdataset unit test
r771 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
Updates chartdataset unit test
r771 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
Updates chartdataset unit test
r771 **
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.
Michal Klocek
Updates chartdataset unit test
r771 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
Updates chartdataset unit test
r771
Michal Klocek
Adds qchartview privte missing file
r750 // W A R N I N G
// -------------
//
Titta Heikkala
Updated private header warning...
r2807 // This file is not part of the Qt Chart API. It exists purely as an
Michal Klocek
Adds qchartview privte missing file
r750 // implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
#ifndef QCHARTVIEW_P_H
#define QCHARTVIEW_P_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartView>
Michal Klocek
Adds qchartview privte missing file
r750
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Michal Klocek
Adds qchartview privte missing file
r750 class QGraphicsScene;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Michal Klocek
Adds qchartview privte missing file
r750
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Adds qchartview privte missing file
r750
class QChart;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 class ChartPresenter;
Michal Klocek
Adds QChartView empty constructor to be able to promote qchartview in qtdesigner
r1290 class QChartView;
Michal Klocek
Adds qchartview privte missing file
r750
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 class QChartViewPrivate
{
Michal Klocek
Adds QChartView empty constructor to be able to promote qchartview in qtdesigner
r1290 public:
Jani Honkonen
Fix Krazy issues
r1935 explicit QChartViewPrivate(QChartView *q, QChart *chart = 0);
Michal Klocek
Adds qchartview privte missing file
r750 ~QChartViewPrivate();
Jani Honkonen
Implement QChartView::setChart()
r2056 void setChart(QChart *chart);
void resize();
Michal Klocek
Adds qchartview privte missing file
r750
Michal Klocek
Adds QChartView empty constructor to be able to promote qchartview in qtdesigner
r1290 protected:
QChartView *q_ptr;
public:
Michal Klocek
Adds qchartview privte missing file
r750 QGraphicsScene *m_scene;
QChart *m_chart;
QPoint m_rubberBandOrigin;
Titta Heikkala
Fix Chart build when QT_NO_RUBBERBAND is defined...
r2623 #ifndef QT_NO_RUBBERBAND
Michal Klocek
Adds qchartview privte missing file
r750 QRubberBand *m_rubberBand;
Titta Heikkala
Fix Chart build when QT_NO_RUBBERBAND is defined...
r2623 #endif
Michal Klocek
Adds qchartview privte missing file
r750 QChartView::RubberBands m_rubberBandFlags;
};
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Adds qchartview privte missing file
r750 #endif