diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-02-18 13:04:42 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-26 08:38:53 +0000 |
commit | 5dcebb60c75b03cec2db63ecc618740a78d7f084 (patch) | |
tree | a016f62d42a9896630bfd8781de956463ad29e68 /sources/pyside2 | |
parent | 5ae663ff57efb4735ef1e69055ea68d904deb3b3 (diff) |
Add setPageSize new signature to QPageSize
The generated code only takes an enum from the meta class
(QPagedPaintDevice) as valid argument of the function `setPageSize`
(QPagedPaintDevice::PageSize), but it should also accept a QPageSize
argument.
Change-Id: Ia31a69a5e52e781844ce6a7e4ff6e5e95d17563d
Fixes: PYSIDE-940
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2')
-rw-r--r-- | sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport_common.xml | 6 | ||||
-rw-r--r-- | sources/pyside2/PySide2/glue/qtprintsupport.cpp | 43 |
2 files changed, 49 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport_common.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport_common.xml index 5ec49c030..5026997c1 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport_common.xml +++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport_common.xml @@ -104,6 +104,12 @@ <extra-includes> <include file-name="QPrinterInfo" location="global"/> </extra-includes> + <!-- fixme: Check if this is still required in Qt 6: + bool QPagedPaintDevice::setPageSize(QPageSize) + void QPagedPaintDevice::setPageSize(QPagedPaintDevice::PageSize) --> + <add-function signature="setPageSize(const QPageSize&)" return-type="bool"> + <inject-code file="../glue/qtprintsupport.cpp" snippet="setpagesize" /> + </add-function> </object-type> <object-type name="QPrintPreviewDialog"/> diff --git a/sources/pyside2/PySide2/glue/qtprintsupport.cpp b/sources/pyside2/PySide2/glue/qtprintsupport.cpp new file mode 100644 index 000000000..300a498c0 --- /dev/null +++ b/sources/pyside2/PySide2/glue/qtprintsupport.cpp @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ + +// @snippet setpagesize +bool out = %CPPSELF.setPageSize(%1); +%PYARG_0 = %CONVERTTOPYTHON[bool](out); +// @snippet setpagesize |