Commit 0b39923c authored by Stephen Kitt's avatar Stephen Kitt

New upstream version 5.11.3+dfsg

parent cb0f5bd3
2018-10-01 Phil Thompson <phil@riverbankcomputing.com>
* NEWS:
Released as v5.11.3.
[5888ae8a5c13] [5.11.3] <5.11-maint>
2018-09-30 Phil Thompson <phil@riverbankcomputing.com>
* NEWS:
Updated the NEWS file.
[24ebe2f77fb9] <5.11-maint>
2018-09-29 Phil Thompson <phil@riverbankcomputing.com>
* PyQtChart.msp:
Added support for Qt v5.11.2.
[0763096c0149] <5.11-maint>
2018-08-02 Phil Thompson <phil@riverbankcomputing.com>
* PyQtChart.msp:
Added the anticipated 5.9 releases to the timeline.
[347d4a358ea3] <5.11-maint>
2018-07-15 Phil Thompson <phil@riverbankcomputing.com>
* NEWS:
Updated the NEWS file.
[1536b185f7d9] <5.11-maint>
2018-06-29 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 5.11.2 for changeset ae73c3ff406a
[6e2ceaa441aa] <5.11-maint>
* NEWS:
Released as v5.11.2.
[ae73c3ff406a] [5.11.2] <5.11-maint>
* NEWS:
Updated the NEWS file.
[3cc0b682be86] <5.11-maint>
2018-06-25 Phil Thompson <phil@riverbankcomputing.com>
* NEWS, PyQtChart.msp:
Updated the project file version.
[23add64f57cd] <5.11-maint>
* PyQtChart.msp:
Fixed all signal signatures.
[b1a1888db38d] <5.11-maint>
2018-06-23 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 5.11.1 for changeset 7446e45613a5
[b6a17381b92a] <5.11-maint>
* NEWS:
Released as v5.11.1.
[7446e45613a5] [5.11.1] <5.11-maint>
2018-06-22 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 5.11 for changeset d29dd54a171b
[bcff1b8af06c]
* NEWS:
Released as v5.11.
[d29dd54a171b] [5.11]
2018-06-21 Phil Thompson <phil@riverbankcomputing.com>
* NEWS:
Updated the NEWS file.
[69b9912c8a22]
* PyQtChart.msp:
Updated for Qt v5.11.1.
[de21a8b4f013]
2018-06-08 Phil Thompson <phil@riverbankcomputing.com>
* NEWS, PyQtChart.msp:
Updated for Qt v5.11.0.
[d61721d4cc5f]
2018-06-07 Phil Thompson <phil@riverbankcomputing.com>
* rb-product:
Update the PyQt5 wheel to use.
[db433be8b097]
* Merged the 5.10-maint branch.
[11585da3c530]
2018-06-04 Phil Thompson <phil@riverbankcomputing.com>
* configure.py:
Added support for the .dist-info directory.
[66f144f65b76] <5.10-maint>
2018-02-27 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 5.10.1 for changeset 9ac64f36ba37
[e8596ff9fff9] <5.10-maint>
* NEWS:
Released as v5.10.1.
[9ac64f36ba37] [5.10.1] <5.10-maint>
......
v5.11.3 1st October 2018
- Added support for Qt Charts v5.11.2.
v5.11.2 2nd July 2018
- A bug fix release.
v5.11.1 24th June 2018
- A pseudo-release to create a version number for updated wheels.
v5.11 23rd June 2018
- Added support for Qt Charts v5.11.0 and v5.11.1.
- A PEP 376 .dist-info directory is created on installation that provides
version information for dependent packages and allows pip to uninstall.
- Added the --no-dist-info option to configure.py.
v5.10.1 26th February 2018
- Added support for Qt Charts v5.10.1.
......
# Copyright (c) 2017, Riverbank Computing Limited
# Copyright (c) 2018, Riverbank Computing Limited
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
......@@ -23,7 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# This is v2.3 of this boilerplate.
# This is v2.8 of this boilerplate.
from distutils import sysconfig
......@@ -55,7 +55,10 @@ class ModuleConfiguration(object):
# The version of the module as a string. Set it to None if you don't
# provide version information.
version = '5.10.1'
version = '5.11.3'
# The name of the PEP 376 .dist-info directory to be created.
distinfo_name = 'PyQtChart'
# Set if a configuration script is provided that handles versions of PyQt4
# prior to v4.10 (i.e. versions where the pyqtconfig.py module is
......@@ -674,6 +677,7 @@ class _TargetConfiguration:
self.sip_version_str = None
self.sysroot = ''
self.stubs_dir = ''
self.distinfo = False
self.prot_is_public = (self.py_platform.startswith('linux') or self.py_platform == 'darwin')
......@@ -767,6 +771,11 @@ class _TargetConfiguration:
# Construct the SIP flags.
flags = []
sip_module = parser.get(section, 'sip_module')
if sip_module is not None:
flags.append('-n')
flags.append(sip_module)
flags.append('-t')
flags.append(self._get_platform_tag())
......@@ -1025,6 +1034,9 @@ class _TargetConfiguration:
if opts.sip is not None:
self.sip = opts.sip
if pkg_config.distinfo_name and opts.distinfo:
self.distinfo = True
pkg_config.apply_options(self, opts)
@staticmethod
......@@ -1065,6 +1077,11 @@ def _create_optparser(target_config, pkg_config):
metavar="SPEC",
help="pass -spec SPEC to qmake")
if pkg_config.distinfo_name:
p.add_option("--no-dist-info", action="store_false", default=True,
dest="distinfo",
help="do not install the dist-info directory")
if _has_stubs(pkg_config):
p.add_option('--stubsdir', dest='stubsdir', type='string',
default=None, action='callback',
......@@ -1235,10 +1252,12 @@ def _inform_user(target_config, pkg_config):
os.path.join(target_config.api_dir, 'api', 'python'))
def _generate_code(target_config, opts, pkg_config, module_config):
def _generate_code(target_config, opts, pkg_config, module_config, all_installs):
""" Generate the code for the module. target_config is the target
configuration. opts are the command line options. pkg_config is the
package configuration. module_config is the module configuration.
all_installs is a list that is updated with the files installed for this
module.
"""
inform(
......@@ -1300,8 +1319,10 @@ def _generate_code(target_config, opts, pkg_config, module_config):
argv.append('-c')
argv.append(os.path.abspath(module_config.name))
# This assumes that, for multi-module packages, all modules's .sip files
# This assumes that, for multi-module packages, each modules' .sip files
# will be rooted in a common root directory.
pkg_root = os.path.dirname(os.path.abspath(__file__))
sip_file = module_config.get_sip_file(target_config)
head, tail = os.path.split(sip_file)
......@@ -1310,9 +1331,9 @@ def _generate_code(target_config, opts, pkg_config, module_config):
if tail != sip_file:
argv.append('-I')
argv.append(quote(tail))
argv.append(quote(os.path.join(pkg_root, tail)))
argv.append(sip_file)
argv.append(os.path.join(pkg_root, sip_file))
check_file = os.path.join(module_config.name,
'sipAPI%s.h' % module_config.name)
......@@ -1324,7 +1345,7 @@ def _generate_code(target_config, opts, pkg_config, module_config):
error("Unable to create the C++ code.")
# Generate the .pro file.
_generate_pro(target_config, opts, module_config)
_generate_pro(target_config, opts, module_config, all_installs)
def _get_qt_qmake_config(qmake_config, qt_version):
......@@ -1350,10 +1371,11 @@ def _write_qt_qmake_config(qt_qmake_config, pro):
pro.write(' %s += %s\n' % (name, value))
def _generate_pro(target_config, opts, module_config):
def _generate_pro(target_config, opts, module_config, all_installs):
""" Generate the .pro file for the module. target_config is the target
configuration. opts are the command line options. module_config is the
module configuration.
module configuration. all_installs is a list that is updated with the
files installed for this module.
"""
inform("Generating the .pro file for the %s module..." % module_config.name)
......@@ -1439,6 +1461,13 @@ target.path = %s
INSTALLS += target
''' % quote(target_config.module_dir))
if sys.platform == 'win32':
fs = '{}.lib' if opts.static else '{}.pyd'
else:
fs = 'lib{}.a' if opts.static else '{}.so'
all_installs.append(target_config.module_dir + '/' + fs.format(mname))
sip_installs = module_config.get_sip_installs(target_config)
if sip_installs is not None:
path, files = sip_installs
......@@ -1454,6 +1483,8 @@ sip.files =''' % quote(path))
INSTALLS += sip
''')
all_installs.append(path)
pro.write('\n')
# These optimisations could apply to other platforms.
......@@ -1712,8 +1743,11 @@ def _main(argv, pkg_config):
pkg_config.pre_code_generation(target_config)
# Generate the code.
all_installs = []
for module_config in pkg_config.modules:
_generate_code(target_config, opts, pkg_config, module_config)
_generate_code(target_config, opts, pkg_config, module_config,
all_installs)
# Concatenate any .api files.
if pkg_config.qscintilla_api_file and target_config.api_dir != '':
......@@ -1755,12 +1789,43 @@ pep484_stubs.files = %s
INSTALLS += pep484_stubs
''' % (target_config.stubs_dir, ' '.join(stubs)))
all_installs.extend(
[target_config.stubs_dir + '/' + pyi for pyi in stubs])
if pkg_config.qscintilla_api_file and target_config.api_dir != '':
api_dir = target_config.api_dir + '/api/python'
api_file = pkg_config.qscintilla_api_file + '.api'
pro.write('''
api.path = %s/api/python
api.files = %s.api
api.path = %s
api.files = %s
INSTALLS += api
''' % (target_config.api_dir, pkg_config.qscintilla_api_file))
''' % (api_dir, api_file))
all_installs.append(api_dir + '/' + api_file)
if target_config.distinfo:
# Allow for out-of-tree builds.
mk_distinfo = os.path.join(os.path.dirname(os.path.abspath(__file__)),
'mk_distinfo.py')
distinfo_dir = os.path.join(target_config.py_module_dir,
pkg_config.distinfo_name + '-' + pkg_config.version + '.dist-info')
run_mk_distinfo = '%s %s \\"$(INSTALL_ROOT)\\" %s installed.txt' % (
sys.executable, mk_distinfo, distinfo_dir)
pro.write('''
distinfo.extra = %s
distinfo.path = %s
INSTALLS += distinfo
''' % (run_mk_distinfo, target_config.module_dir))
# Create the file containing the names of all installed files.
installed = open('installed.txt', 'w')
for install in all_installs:
installed.write(install + '\n')
installed.close()
pro.close()
......@@ -1780,11 +1845,17 @@ if __name__ == '__main__':
except NameError:
pkg_config_type = type('PackageConfiguration', (object, ), {})
if not hasattr(pkg_config_type, 'modules'):
if hasattr(pkg_config_type, 'modules'):
# Provide some default values.
pkg_config_type.distinfo_name = getattr(pkg_config_type,
'distinfo_name', '')
else:
mod_config_type = ModuleConfiguration
# Extract the package-specific attributes and methods.
pkg_config_type.descriptive_name = mod_config_type.descriptive_name
pkg_config_type.distinfo_name = getattr(mod_config_type,
'distinfo_name', '')
pkg_config_type.legacy_configuration_script = mod_config_type.legacy_configuration_script
pkg_config_type.minimum_sip_version = mod_config_type.minimum_sip_version
pkg_config_type.protected_is_public_is_supported = mod_config_type.protected_is_public_is_supported
......
# This script handles the creation of the PEP 376 .dist-info directory for a
# package.
#
# Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
#
# This script is distributed under the terms of the GNU General Public License
# v3 as published by the Free Software Foundation.
#
# This script is supplied WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
import base64
import hashlib
import os
import shutil
import sys
def error(message):
""" Display an error message and terminate. """
sys.stderr.write(message + '\n')
sys.exit(1)
# Parse the command line.
if len(sys.argv) != 4:
error("usage: {0} prefix dist-info installed".format(sys.argv[0]))
prefix_dir = sys.argv[1]
distinfo_dir = sys.argv[2]
installed_fn = sys.argv[3]
# Read the list of installed files.
installed_f = open(installed_fn)
installed = installed_f.read().strip().split('\n')
installed_f.close()
# The prefix directory corresponds to DESTDIR or INSTALL_ROOT.
real_distinfo_dir = prefix_dir + distinfo_dir
# Remove any existing dist-info directory and create an empty one.
if os.path.exists(real_distinfo_dir):
try:
shutil.rmtree(real_distinfo_dir)
except:
error("unable to delete existing {0}".format(real_distinfo_dir))
try:
os.mkdir(real_distinfo_dir)
except:
error("unable to create {0}".format(real_distinfo_dir))
# Create the INSTALLER file. We pretend that pip was the installer.
installer_fn = os.path.join(distinfo_dir, 'INSTALLER')
installer_f = open(prefix_dir + installer_fn, 'w')
installer_f.write('pip\n')
installer_f.close()
installed.append(installer_fn)
# Create the METADATA file.
METADATA = '''Metadata-Version: 1.1
Name: {0}
Version: {1}
'''
distinfo_path, distinfo_base = os.path.split(distinfo_dir)
pkg_name, version = os.path.splitext(distinfo_base)[0].split('-')
metadata_fn = os.path.join(distinfo_dir, 'METADATA')
metadata_f = open(prefix_dir + metadata_fn, 'w')
metadata_f.write(METADATA.format(pkg_name, version))
metadata_f.close()
installed.append(metadata_fn)
# Create the RECORD file.
record_fn = os.path.join(distinfo_dir, 'RECORD')
record_f = open(prefix_dir + record_fn, 'w')
for name in installed:
native_name = prefix_dir + name.replace('/', os.sep)
if os.path.isdir(native_name):
all_fns = []
for root, dirs, files in os.walk(native_name):
for f in files:
all_fns.append(os.path.join(root, f).replace(os.sep, '/'))
if '__pycache__' in dirs:
dirs.remove('__pycache__')
else:
all_fns = [prefix_dir + name]
for fn in all_fns:
real_distinfo_path = prefix_dir + distinfo_path
if fn.startswith(real_distinfo_path):
fn_name = fn[len(real_distinfo_path) + 1:].replace('\\', '/')
elif fn.startswith(prefix_dir + sys.prefix):
fn_name = os.path.relpath(
fn, real_distinfo_path).replace('\\', '/')
else:
fn_name = fn[len(prefix_dir):]
fn_f = open(fn, 'rb')
data = fn_f.read()
fn_f.close()
digest = base64.urlsafe_b64encode(
hashlib.sha256(data).digest()).rstrip(b'=').decode('ascii')
record_f.write(
'{0},sha256={1},{2}\n'.format(fn_name, digest, len(data)))
record_f.write('{0}/RECORD,,\n'.format(distinfo_base))
record_f.close()
......@@ -25,7 +25,7 @@
%Import QtGui/QtGuimod.sip
%Import QtWidgets/QtWidgetsmod.sip
%Timeline {QtChart_1_0_0 QtChart_1_1_0 QtChart_1_2_0 QtChart_1_2_1 QtChart_1_3_0 QtChart_1_3_1 QtChart_1_4_0 QtChart_2_0_0 QtChart_2_0_1 QtChart_2_1_0 QtChart_5_7_0 QtChart_5_7_1 QtChart_5_8_0 QtChart_5_9_0 QtChart_5_9_1 QtChart_5_9_2 QtChart_5_9_3 QtChart_5_10_0 QtChart_5_10_1}
%Timeline {QtChart_1_0_0 QtChart_1_1_0 QtChart_1_2_0 QtChart_1_2_1 QtChart_1_3_0 QtChart_1_3_1 QtChart_1_4_0 QtChart_2_0_0 QtChart_2_0_1 QtChart_2_1_0 QtChart_5_7_0 QtChart_5_7_1 QtChart_5_8_0 QtChart_5_9_0 QtChart_5_9_1 QtChart_5_9_2 QtChart_5_9_3 QtChart_5_9_4 QtChart_5_9_5 QtChart_5_9_6 QtChart_5_9_7 QtChart_5_9_8 QtChart_5_9_9 QtChart_5_10_0 QtChart_5_10_1 QtChart_5_11_0 QtChart_5_11_1 QtChart_5_11_2}
%Feature PYQTC_v1_0
%Feature PYQTC_v1_1
......
......@@ -282,10 +282,5 @@ namespace QtCharts
%If (QtChart_2_1_0 -)
void reverseChanged(bool reverse);
%End
private:
%If (QtChart_2_0_0 -)
QAbstractAxis(const QtCharts::QAbstractAxis &);
%End
};
};
......@@ -55,17 +55,17 @@ namespace QtCharts
%End
signals:
void clicked(int index, QtCharts::QBarSet *barset);
void clicked(int index, QtCharts::QBarSet *barset /ScopesStripped=1/);
%If (- QtChart_2_0_0)
void hovered(bool status, QtCharts::QBarSet *barset);
void hovered(bool status, QtCharts::QBarSet *barset /ScopesStripped=1/);
%End
%If (QtChart_1_3_1 -)
void hovered(bool status, int index, QtCharts::QBarSet *barset);
void hovered(bool status, int index, QtCharts::QBarSet *barset /ScopesStripped=1/);
%End
void countChanged();
void labelsVisibleChanged();
void barsetsAdded(QList<QtCharts::QBarSet *> sets);
void barsetsRemoved(QList<QtCharts::QBarSet *> sets);
void barsetsAdded(QList<QtCharts::QBarSet *> sets /ScopesStripped=1/);
void barsetsRemoved(QList<QtCharts::QBarSet *> sets /ScopesStripped=1/);
public:
%If (QtChart_1_4_0 -)
......@@ -97,16 +97,16 @@ namespace QtCharts
void labelsFormatChanged(const QString &format);
%End
%If (QtChart_1_4_0 -)
void labelsPositionChanged(QtCharts::QAbstractBarSeries::LabelsPosition position);
void labelsPositionChanged(QtCharts::QAbstractBarSeries::LabelsPosition position /ScopesStripped=1/);
%End
%If (QtChart_2_0_0 -)
void pressed(int index, QtCharts::QBarSet *barset);
void pressed(int index, QtCharts::QBarSet *barset /ScopesStripped=1/);
%End
%If (QtChart_2_0_0 -)
void released(int index, QtCharts::QBarSet *barset);
void released(int index, QtCharts::QBarSet *barset /ScopesStripped=1/);
%End
%If (QtChart_2_0_0 -)
void doubleClicked(int index, QtCharts::QBarSet *barset);
void doubleClicked(int index, QtCharts::QBarSet *barset /ScopesStripped=1/);
%End
public:
......@@ -121,5 +121,18 @@ namespace QtCharts
%If (QtChart_2_1_0 -)
void labelsAngleChanged(qreal angle);
%End
public:
%If (QtChart_5_11_0 -)
void setLabelsPrecision(int precision);
%End
%If (QtChart_5_11_0 -)
int labelsPrecision() const;
%End
signals:
%If (QtChart_5_11_0 -)
void labelsPrecisionChanged(int precision);
%End
};
};
......@@ -39,9 +39,6 @@ namespace QtCharts
virtual ~QAreaLegendMarker();
virtual QtCharts::QLegendMarker::LegendMarkerType type();
virtual QtCharts::QAreaSeries *series();
private:
QAreaLegendMarker(const QtCharts::QAreaLegendMarker &);
};
};
......
......@@ -122,8 +122,5 @@ namespace QtCharts
%If (QtChart_2_1_0 -)
void pointLabelsClippingChanged(bool clipping);
%End
private:
QAreaSeries(const QtCharts::QAreaSeries &);
};
};
......@@ -62,9 +62,6 @@ namespace QtCharts
%If (QtChart_1_2_0 -)
void countChanged();
%End
private:
QBarCategoryAxis(const QtCharts::QBarCategoryAxis &);
};
};
......
......@@ -40,9 +40,6 @@ namespace QtCharts
virtual QtCharts::QLegendMarker::LegendMarkerType type();
virtual QtCharts::QAbstractBarSeries *series();
QtCharts::QBarSet *barset();
private:
QBarLegendMarker(const QtCharts::QBarLegendMarker &);
};
};
......
......@@ -38,8 +38,5 @@ namespace QtCharts
virtual ~QBarSeries();
%End
virtual QtCharts::QAbstractSeries::SeriesType type() const;
private:
QBarSeries(const QtCharts::QBarSeries &);
};
};
......@@ -99,8 +99,5 @@ namespace QtCharts
%If (QtChart_2_0_0 -)
void doubleClicked(int index);
%End
private:
QBarSet(const QtCharts::QBarSet &);
};
};
......@@ -39,9 +39,6 @@ namespace QtCharts
virtual ~QBoxPlotLegendMarker();
virtual QtCharts::QLegendMarker::LegendMarkerType type();
virtual QtCharts::QBoxPlotSeries *series();
private:
QBoxPlotLegendMarker(const QtCharts::QBoxPlotLegendMarker &);
};
};
......
......@@ -56,27 +56,24 @@ namespace QtCharts
QPen pen() const;
signals:
void clicked(QtCharts::QBoxSet *boxset);
void hovered(bool status, QtCharts::QBoxSet *boxset);
void clicked(QtCharts::QBoxSet *boxset /ScopesStripped=1/);
void hovered(bool status, QtCharts::QBoxSet *boxset /ScopesStripped=1/);
void countChanged();
void penChanged();
void brushChanged();
void boxOutlineVisibilityChanged();
void boxWidthChanged();
void boxsetsAdded(QList<QtCharts::QBoxSet *> sets);
void boxsetsRemoved(QList<QtCharts::QBoxSet *> sets);
void boxsetsAdded(QList<QtCharts::QBoxSet *> sets /ScopesStripped=1/);
void boxsetsRemoved(QList<QtCharts::QBoxSet *> sets /ScopesStripped=1/);
%If (QtChart_2_0_0 -)
void pressed(QtCharts::QBoxSet *boxset);
void pressed(QtCharts::QBoxSet *boxset /ScopesStripped=1/);
%End
%If (QtChart_2_0_0 -)
void released(QtCharts::QBoxSet *boxset);
void released(QtCharts::QBoxSet *boxset /ScopesStripped=1/);
%End
%If (QtChart_2_0_0 -)
void doubleClicked(QtCharts::QBoxSet *boxset);
void doubleClicked(QtCharts::QBoxSet *boxset /ScopesStripped=1/);
%End
private:
QBoxPlotSeries(const QtCharts::QBoxPlotSeries &);
};
};
......
......@@ -79,9 +79,6 @@ namespace QtCharts
%If (QtChart_2_0_0 -)
void doubleClicked();
%End
private:
QBoxSet(const QtCharts::QBoxSet &);
};
};
......
......@@ -69,13 +69,13 @@ namespace QtCharts
QPen pen() const;
signals:
void clicked(QtCharts::QCandlestickSet *set);
void hovered(bool status, QtCharts::QCandlestickSet *set);
void pressed(QtCharts::QCandlestickSet *set);
void released(QtCharts::QCandlestickSet *set);
void doubleClicked(QtCharts::QCandlestickSet *set);
void candlestickSetsAdded(const QList<QtCharts::QCandlestickSet *> &sets);
void candlestickSetsRemoved(const QList<QtCharts::QCandlestickSet *> &sets);
void clicked(QtCharts::QCandlestickSet *set /ScopesStripped=1/);
void hovered(bool status, QtCharts::QCandlestickSet *set /ScopesStripped=1/);
void pressed(QtCharts::QCandlestickSet *set /ScopesStripped=1/);
void released(QtCharts::QCandlestickSet *set /ScopesStripped=1/);
void doubleClicked(QtCharts::QCandlestickSet *set /ScopesStripped=1/);
void candlestickSetsAdded(const QList<QtCharts::QCandlestickSet *> &sets /ScopesStripped=1/);
void candlestickSetsRemoved(const QList<QtCharts::QCandlestickSet *> &sets /ScopesStripped=1/);
void countChanged();
void maximumColumnWidthChanged();
void minimumColumnWidthChanged();
......
......@@ -71,11 +71,8 @@ namespace QtCharts
signals:
%If (QtChart_2_1_0 -)
void labelsPositionChanged(QtCharts::QCategoryAxis::AxisLabelsPosition position);
void labelsPositionChanged(QtCharts::QCategoryAxis::AxisLabelsPosition position /ScopesStripped=1/);
%End
private:
QCategoryAxis(const QtCharts::QCategoryAxis &);
};
};
......
......@@ -56,7 +56,7 @@ namespace QtCharts
};
typedef QFlags<QtCharts::QChart::AnimationOption> AnimationOptions;
QChart(QGraphicsItem *parent /TransferThis/ = 0, Qt::WindowFlags flags = 0);
QChart(QGraphicsItem *parent /TransferThis/ = 0, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QChart();
void addSeries(QtCharts::QAbstractSeries *series /Transfer/);
void removeSeries(QtCharts::QAbstractSeries *series /TransferBack/);
......@@ -206,11 +206,6 @@ namespace QtCharts
%If (QtChart_2_1_0 -)
QEasingCurve animationEasingCurve() const;
%End
private:
%If (QtChart_2_0_0 -)
QChart(const QtCharts::QChart &);
%End
};
};
......
......@@ -25,6 +25,6 @@ int PYQT_CHART_VERSION;
const char *PYQT_CHART_VERSION_STR;
%ModuleCode
static int PYQT_CHART_VERSION = 0x050a01;
static const char *PYQT_CHART_VERSION_STR = "5.10.1";
static int PYQT_CHART_VERSION = 0x050b03;
static const char *PYQT_CHART_VERSION_STR = "5.11.3";
%End