From b814f865c0618faaaacb710bd0e8eb2804aaed00 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 18 May 2017 11:10:32 +0200
Subject: Add QtCharts

Task-number: PYSIDE-487
Change-Id: I742d0fe52da22a06ca04069b6e0094d1913cc187
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/pyside2/PySide2/QtCharts/CMakeLists.txt    | 104 +++++++++++++++++
 .../pyside2/PySide2/QtCharts/typesystem_charts.xml | 124 +++++++++++++++++++++
 .../PySide2/QtCore/typesystem_core_common.xml      |   2 +
 sources/pyside2/PySide2/global.h.in                |   1 +
 4 files changed, 231 insertions(+)
 create mode 100644 sources/pyside2/PySide2/QtCharts/CMakeLists.txt
 create mode 100644 sources/pyside2/PySide2/QtCharts/typesystem_charts.xml

(limited to 'sources/pyside2/PySide2')

diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt
new file mode 100644
index 000000000..03c07b546
--- /dev/null
+++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt
@@ -0,0 +1,104 @@
+project(QtCharts)
+
+set(QtCharts_SRC
+${QtCharts_GEN_DIR}/qtcharts_qabstractaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qabstractbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qabstractseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qarealegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qareaseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qbarcategoryaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qbarlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qbarset_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qboxplotlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qboxplotseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qboxset_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qcandlesticklegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qcandlestickseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qcandlestickset_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qcategoryaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qchart_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qchartview_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qdatetimeaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhorizontalbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhorizontalpercentbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhorizontalstackedbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qhxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qlegend_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qlineseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qlogvalueaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpercentbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpielegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpieseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpieslice_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qpolarchart_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qscatterseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qsplineseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qstackedbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvalueaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qvxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qxylegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_qxyseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qtcharts_wrapper.cpp
+# module is always needed
+${QtCharts_GEN_DIR}/qtcharts_module_wrapper.cpp
+)
+
+# Sanitize windows.h as pulled by gl.h to prevent clashes with QValueAxis::min(), etc.
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX")
+endif()
+
+make_path(QtCharts_typesystem_path
+    ${QtCore_SOURCE_DIR}
+    ${QtCore_BINARY_DIR}
+    ${QtGui_SOURCE_DIR}
+    ${QtGui_BINARY_DIR}
+    ${QtWidgets_SOURCE_DIR}
+    ${QtWidgets_BINARY_DIR}
+    ${QtCharts_SOURCE_DIR})
+
+set(QtCharts_include_dirs ${QtCharts_SOURCE_DIR}
+                          ${QtCharts_BINARY_DIR}
+                          ${Qt5Core_INCLUDE_DIRS}
+                          ${Qt5Gui_INCLUDE_DIRS}
+                          ${Qt5Widgets_INCLUDE_DIRS}
+                          ${Qt5Charts_INCLUDE_DIRS}
+                          ${SHIBOKEN_INCLUDE_DIR}
+                          ${libpyside_SOURCE_DIR}
+                          ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                          ${QtCore_GEN_DIR}
+                          ${QtGui_GEN_DIR}
+                          ${QtWidgets_GEN_DIR})
+
+set(QtCharts_libraries    pyside2
+                          ${SHIBOKEN_PYTHON_LIBRARIES}
+                          ${SHIBOKEN_LIBRARY}
+                          ${Qt5Charts_LIBRARIES}
+                          ${Qt5Core_LIBRARIES}
+                          ${Qt5Gui_LIBRARIES}
+                          ${Qt5Widgets_LIBRARIES})
+
+set(QtCharts_deps QtCore QtGui QtWidgets)
+
+create_pyside_module(QtCharts
+                     QtCharts_include_dirs
+                     QtCharts_libraries
+                     QtCharts_deps
+                     QtCharts_typesystem_path
+                     QtCharts_SRC
+                     "")
diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
new file mode 100644
index 000000000..d17734273
--- /dev/null
+++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of PySide2.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or 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.GPL2 and 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-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<typesystem package="PySide2.QtCharts">
+  <load-typesystem name="typesystem_widgets.xml" generate="no" />
+  <namespace-type name="QtCharts">
+      <object-type name="QAbstractAxis" since="5.7">
+          <enum-type name="AxisType"/>
+      </object-type>
+      <object-type name="QAbstractBarSeries" since="5.7">
+          <enum-type name="LabelsPosition"/>
+      </object-type>
+      <object-type name="QAbstractSeries" since="5.7">
+          <enum-type name="SeriesType"/>
+      </object-type>
+      <object-type name="QAreaLegendMarker" since="5.7"/>
+      <object-type name="QAreaSeries" since="5.7"/>
+      <object-type name="QBarCategoryAxis" since="5.7"/>
+      <object-type name="QBarLegendMarker" since="5.7"/>
+      <object-type name="QBarModelMapper" since="5.7"/>
+      <object-type name="QBarSeries" since="5.7"/>
+      <object-type name="QBarSet" since="5.7"/>
+      <object-type name="QBoxPlotLegendMarker" since="5.7"/>
+      <object-type name="QBoxPlotModelMapper" since="5.7"/>
+      <object-type name="QBoxPlotSeries" since="5.7"/>
+      <object-type name="QBoxSet" since="5.7">
+          <enum-type name="ValuePositions"/>
+      </object-type>
+      <object-type name="QCandlestickLegendMarker" since="5.7"/>
+      <object-type name="QCandlestickModelMapper" since="5.7"/>
+      <object-type name="QCandlestickSeries" since="5.7"/>
+      <object-type name="QCandlestickSet" since="5.7"/>
+      <object-type name="QCategoryAxis" since="5.7"/>
+      <object-type name="QChart" since="5.7">
+          <enum-type name="ChartType"/>
+          <enum-type name="ChartTheme"/>
+          <enum-type name="AnimationOption"/>
+      </object-type>
+      <object-type name="QChartView" since="5.7">
+          <enum-type name="RubberBand"/>
+      </object-type>
+      <object-type name="QDateTimeAxis" since="5.7"/>
+      <object-type name="QHBarModelMapper" since="5.7"/>
+      <object-type name="QHBoxPlotModelMapper" since="5.7"/>
+      <object-type name="QHCandlestickModelMapper" since="5.7"/>
+      <object-type name="QHorizontalBarSeries" since="5.7"/>
+      <object-type name="QHorizontalPercentBarSeries" since="5.7"/>
+      <object-type name="QHorizontalStackedBarSeries" since="5.7"/>
+      <object-type name="QHPieModelMapper" since="5.7"/>
+      <object-type name="QHXYModelMapper" since="5.7"/>
+      <object-type name="QLegend" since="5.7">
+          <enum-type name="MarkerShape"/>
+      </object-type>
+      <object-type name="QLegendMarker" since="5.7">
+          <enum-type name="LegendMarkerType"/>
+      </object-type>
+      <object-type name="QLineSeries" since="5.7"/>
+      <object-type name="QLogValueAxis" since="5.7"/>
+      <object-type name="QPercentBarSeries" since="5.7"/>
+      <object-type name="QPieLegendMarker" since="5.7"/>
+      <object-type name="QPieModelMapper" since="5.7"/>
+      <object-type name="QPieSeries" since="5.7"/>
+      <object-type name="QPieSlice" since="5.7">
+          <enum-type name="LabelPosition"/>
+      </object-type>
+      <object-type name="QPolarChart" since="5.7">
+          <enum-type name="PolarOrientation" flags="PolarOrientations"/>
+          <!-- Compile error assigning default flags value -->
+          <modify-function signature="axes(QFlags&lt;QtCharts::QPolarChart::PolarOrientation&gt;,QtCharts::QAbstractSeries*)const" remove="all"/>
+      </object-type>
+      <object-type name="QScatterSeries" since="5.7">
+          <enum-type name="MarkerShape"/>
+      </object-type>
+      <object-type name="QSplineSeries" since="5.7"/>
+      <object-type name="QStackedBarSeries" since="5.7"/>
+      <object-type name="QValueAxis" since="5.7"/>
+      <object-type name="QVBarModelMapper" since="5.7"/>
+      <object-type name="QVBoxPlotModelMapper" since="5.7"/>
+      <object-type name="QVCandlestickModelMapper" since="5.7"/>
+      <object-type name="QVPieModelMapper" since="5.7"/>
+      <object-type name="QVXYModelMapper" since="5.7"/>
+      <object-type name="QXYLegendMarker" since="5.7"/>
+      <object-type name="QXYModelMapper" since="5.7"/>
+      <object-type name="QXYSeries" since="5.7"/>
+  </namespace-type>
+</typesystem>
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index be570bd60..b8e070788 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -147,6 +147,8 @@
   <rejection class="*" argument-type="QListData::Data*"/>
   <rejection class="*" argument-type="QListData::NotArrayCompatibleLayout"/>
   <rejection class="*" argument-type="QList::Node*"/>
+  <rejection class="*" argument-type="QTSMFI"/>
+  <rejection class="*" argument-type="QTSMFC"/>
   <rejection class="*" argument-type="QMutexData*"/>
   <rejection class="*" argument-type="QObjectUserData*"/>
   <rejection class="*" argument-type="QtPrivate::QSlotObjectBase*"/>
diff --git a/sources/pyside2/PySide2/global.h.in b/sources/pyside2/PySide2/global.h.in
index 3422f0d6e..b8ac01bba 100644
--- a/sources/pyside2/PySide2/global.h.in
+++ b/sources/pyside2/PySide2/global.h.in
@@ -73,6 +73,7 @@
 #ifndef QT_NO_OPENGL
 // Define export macros for Windows' gl.h
 #  ifdef Q_OS_WIN
+#    define NOMINMAX // windows.h is pulled, sanitize
 #    ifndef APIENTRY
 #      define APIENTRY
 #    endif
-- 
cgit v1.2.3