##// 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
qchartsplugin.h
56 lines | 2.0 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Marek Rosa
License added to several files
r1365 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Marek Rosa
License added to several files
r1365 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Marek Rosa
License added to several files
r1365 **
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.
Marek Rosa
License added to several files
r1365 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Marek Rosa
License added to several files
r1365
Jani Honkonen
Fix Krazy issues
r1935 #ifndef QCHARTSPLUGIN_H
#define QCHARTSPLUGIN_H
Michal Klocek
Adds designer plugin stub
r1201
Titta Heikkala
Fix include syntax...
r2714 #include <QtDesigner/QDesignerCustomWidgetInterface>
Michal Klocek
Adds designer plugin stub
r1201
Jani Honkonen
coding style fixes for plugins
r2101 class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface
Michal Klocek
Adds designer plugin stub
r1201 {
Jani Honkonen
Fixing qml build for latest Qt5...
r2247 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
Marek Rosa
Qt5: initial fix for designer plugin
r2059
Michal Klocek
Adds designer plugin stub
r1201 Q_OBJECT
Q_INTERFACES(QDesignerCustomWidgetInterface)
public:
QChartsPlugin(QObject *parent = 0);
~QChartsPlugin();
QString name() const;
QString includeFile() const;
QString group() const;
QIcon icon() const;
QString toolTip() const;
QString whatsThis() const;
bool isContainer() const;
QWidget *createWidget(QWidget *parent);
Titta Heikkala
Qt Charts project file structure change...
r2712 QString domXml() const;
Michal Klocek
Adds designer plugin stub
r1201 };
Jani Honkonen
Fix Krazy issues
r1935 #endif /* QCHARTSPLUGIN_H */