From ceeb82693a0240b1dd4f51605ba21413927ee558 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 19 May 2020 11:55:10 +0200 Subject: Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6 Test failures: shiboken2:testmodifyfunction pyside2:QtCore::qbytearray_test pyside2:QtGui::bug_PYSIDE-41 pyside2:QtGui::deepcopy_test pyside2:QtGui::qfontmetrics_test pyside2:QtGui::qpixmapcache_test pyside2:QtWidgets::api2_test (QTBUG-85417) pyside2:QtWidgets::bug_632 pyside2:QtWidgets::bug_714 pyside2:QtWidgets::bug_785 pyside2:QtWidgets::qshortcut_test pyside2:QtQml::bug_825 pyside2:QtQml::bug_1029 pyside2:QtQml::registertype pyside2:QtQml::qqmlincubator_incubateWhile pyside2:QtQml::signal_arguments Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335 Reviewed-by: Christian Tismer --- examples/axcontainer/axviewer.py | 3 +- examples/corelib/tools/codecs/codecs.py | 250 ---------------- .../corelib/tools/settingseditor/settingseditor.py | 20 +- examples/external/matplotlib/widget_3dplot.py | 4 +- .../external/opencv/webcam_pattern_detection.py | 4 +- .../external/scikit/staining_colors_separation.py | 4 +- examples/multimedia/camera.py | 4 +- examples/multimedia/player.py | 4 +- examples/opengl/grabber.py | 12 +- examples/scriptableapplication/mainwindow.cpp | 2 +- examples/webenginewidgets/tabbedbrowser/main.py | 4 +- .../graphicsview/diagramscene/diagramscene.py | 18 +- .../widgets/itemviews/addressbook/addressbook.py | 3 +- .../widgets/mainwindows/application/application.py | 20 +- .../widgets/mainwindows/dockwidgets/dockwidgets.py | 6 +- examples/widgets/mainwindows/mdi/mdi.py | 4 +- examples/widgets/systray/window.py | 4 +- examples/xml/dombookmarks/dombookmarks.py | 10 +- sources/cmake_helpers/helpers.cmake | 6 +- sources/pyside2/CMakeLists.txt | 2 +- sources/pyside2/PySide2/QtCore/CMakeLists.txt | 53 ++-- .../PySide2/QtCore/typesystem_core_common.xml | 193 +------------ sources/pyside2/PySide2/QtGui/CMakeLists.txt | 55 +--- .../PySide2/QtGui/typesystem_gui_common.xml | 315 ++++++--------------- sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 3 - .../PySide2/QtNetwork/typesystem_network.xml | 20 +- .../PySide2/QtQml/pysideqmlregistertype.cpp | 8 +- sources/pyside2/PySide2/QtQml/typesystem_qml.xml | 19 +- sources/pyside2/PySide2/QtQuick/CMakeLists.txt | 11 +- .../PySide2/QtQuick/pysidequickregistertype.cpp | 17 +- .../pyside2/PySide2/QtQuick/typesystem_quick.xml | 7 - .../pyside2/PySide2/QtTest/QtTest_global.pre.h.in | 2 +- sources/pyside2/PySide2/QtTest/typesystem_test.xml | 10 +- sources/pyside2/PySide2/QtWidgets/CMakeLists.txt | 9 - .../QtWidgets/typesystem_widgets_common.xml | 149 +--------- sources/pyside2/PySide2/glue/qtcore.cpp | 16 +- sources/pyside2/PySide2/glue/qtgui.cpp | 2 +- sources/pyside2/PySide2/pysideqtesttouch.h | 14 +- sources/pyside2/PySide2/templates/core_common.xml | 4 +- .../examples/mainwindows/application/mainwindow.h | 3 +- .../datavisualize/datavisualize3/main_window.py | 4 +- .../datavisualize/datavisualize4/main_window.py | 4 +- .../datavisualize/datavisualize5/main_window.py | 4 +- .../datavisualize/datavisualize6/main_window.py | 4 +- sources/pyside2/doc/tutorials/expenses/main.py | 4 +- .../doc/tutorials/expenses/steps/02-expenses.py | 3 +- .../doc/tutorials/expenses/steps/03-expenses.py | 3 +- .../doc/tutorials/expenses/steps/04-expenses.py | 3 +- .../doc/tutorials/expenses/steps/05-expenses.py | 3 +- .../doc/tutorials/expenses/steps/06-expenses.py | 3 +- .../doc/tutorials/expenses/steps/07-expenses.py | 3 +- .../doc/tutorials/expenses/steps/08-expenses.py | 3 +- .../doc/tutorials/expenses/steps/09-expenses.py | 4 +- .../doc/tutorials/expenses/steps/10-expenses.py | 4 +- .../tutorials/portingguide/chapter3/bookwindow.py | 3 +- sources/pyside2/plugins/CMakeLists.txt | 6 +- sources/pyside2/tests/QtCore/CMakeLists.txt | 2 - .../pyside2/tests/QtCore/qobject_parent_test.py | 4 - sources/pyside2/tests/QtCore/qregexp_test.py | 55 ---- sources/pyside2/tests/QtCore/qtext_codec_test.py | 54 ---- sources/pyside2/tests/QtCore/qtextstream_test.py | 11 +- sources/pyside2/tests/QtCore/qurlquery_test.py | 2 - sources/pyside2/tests/QtGui/CMakeLists.txt | 3 - sources/pyside2/tests/QtGui/deepcopy_test.py | 7 +- sources/pyside2/tests/QtGui/qmatrix_test.py | 106 ------- sources/pyside2/tests/QtGui/qopenglbuffer_test.py | 98 ------- .../pyside2/tests/QtGui/qtextdocument_functions.py | 3 - sources/pyside2/tests/QtGui/repr_test.py | 7 +- sources/pyside2/tests/QtNetwork/bug_446.py | 2 +- sources/pyside2/tests/QtOpenGL/CMakeLists.txt | 2 + .../pyside2/tests/QtOpenGL/qopenglbuffer_test.py | 98 +++++++ sources/pyside2/tests/QtUiTools/bug_392.py | 2 +- sources/pyside2/tests/QtUiTools/bug_426.py | 2 +- sources/pyside2/tests/QtWidgets/CMakeLists.txt | 1 - sources/pyside2/tests/QtWidgets/add_action_test.py | 3 +- sources/pyside2/tests/QtWidgets/bug_363.py | 59 ---- sources/pyside2/tests/QtWidgets/bug_711.py | 3 +- sources/pyside2/tests/QtWidgets/bug_860.py | 2 +- sources/pyside2/tests/QtWidgets/qaction_test.py | 3 +- sources/pyside2/tests/QtWidgets/qshortcut_test.py | 20 +- .../tests/QtWidgets/qstring_qkeysequence_test.py | 4 +- sources/pyside2/tests/QtWidgets/qtoolbar_test.py | 3 +- sources/pyside2/tests/pysidetest/CMakeLists.txt | 12 +- .../pysidetest/new_inherited_functions_test.py | 6 +- sources/shiboken2/CMakeLists.txt | 2 +- 85 files changed, 421 insertions(+), 1507 deletions(-) delete mode 100644 examples/corelib/tools/codecs/codecs.py delete mode 100644 sources/pyside2/tests/QtCore/qregexp_test.py delete mode 100644 sources/pyside2/tests/QtCore/qtext_codec_test.py delete mode 100644 sources/pyside2/tests/QtGui/qmatrix_test.py delete mode 100644 sources/pyside2/tests/QtGui/qopenglbuffer_test.py create mode 100644 sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py delete mode 100644 sources/pyside2/tests/QtWidgets/bug_363.py diff --git a/examples/axcontainer/axviewer.py b/examples/axcontainer/axviewer.py index e9083d8f4..50e50ee1c 100644 --- a/examples/axcontainer/axviewer.py +++ b/examples/axcontainer/axviewer.py @@ -43,7 +43,8 @@ import sys from PySide2.QtAxContainer import QAxSelect, QAxWidget -from PySide2.QtWidgets import (QAction, QApplication, QDialog, +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QApplication, QDialog, QMainWindow, QMessageBox, QToolBar) class MainWindow(QMainWindow): diff --git a/examples/corelib/tools/codecs/codecs.py b/examples/corelib/tools/codecs/codecs.py deleted file mode 100644 index a3c063c04..000000000 --- a/examples/corelib/tools/codecs/codecs.py +++ /dev/null @@ -1,250 +0,0 @@ - -############################################################################# -## -## Copyright (C) 2013 Riverbank Computing Limited. -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# - -"""PySide2 port of the widgets/tools/codecs example from Qt v5.x""" - -from PySide2 import QtCore, QtWidgets - - -def codec_name(codec): - try: - # Python v3. - name = str(codec.name(), encoding='ascii') - except TypeError: - # Python v2. - name = str(codec.name()) - - return name - - -class MainWindow(QtWidgets.QMainWindow): - def __init__(self): - super(MainWindow, self).__init__() - - self.textEdit = QtWidgets.QTextEdit() - self.textEdit.setLineWrapMode(QtWidgets.QTextEdit.NoWrap) - self.setCentralWidget(self.textEdit) - - self.codecs = [] - self.findCodecs() - - self.previewForm = PreviewForm(self) - self.previewForm.setCodecList(self.codecs) - - self.saveAsActs = [] - self.createActions() - self.createMenus() - - self.setWindowTitle("Codecs") - self.resize(500, 400) - - def open(self): - fileName, _ = QtWidgets.QFileDialog.getOpenFileName(self) - if fileName: - inFile = QtCore.QFile(fileName) - if not inFile.open(QtCore.QFile.ReadOnly): - QtWidgets.QMessageBox.warning(self, "Codecs", - "Cannot read file %s:\n%s" % (fileName, inFile.errorString())) - return - - data = inFile.readAll() - - self.previewForm.setEncodedData(data) - if self.previewForm.exec_(): - self.textEdit.setPlainText(self.previewForm.decodedString()) - - def save(self): - fileName = QtWidgets.QFileDialog.getSaveFileName(self) - if fileName: - outFile = QtCore.QFile(fileName) - if not outFile.open(QtCore.QFile.WriteOnly|QtCore.QFile.Text): - QtWidgets.QMessageBox.warning(self, "Codecs", - "Cannot write file %s:\n%s" % (fileName, outFile.errorString())) - return - - action = self.sender() - codecName = action.data() - - out = QtCore.QTextStream(outFile) - out.setCodec(codecName) - out << self.textEdit.toPlainText() - - def about(self): - QtWidgets.QMessageBox.about(self, "About Codecs", - "The Codecs example demonstrates how to read and " - "write files using various encodings.") - - def aboutToShowSaveAsMenu(self): - currentText = self.textEdit.toPlainText() - - for action in self.saveAsActs: - codecName = str(action.data()) - codec = QtCore.QTextCodec.codecForName(codecName) - action.setVisible(codec and codec.canEncode(currentText)) - - def findCodecs(self): - codecMap = [] - iso8859RegExp = QtCore.QRegExp('ISO[- ]8859-([0-9]+).*') - - for mib in QtCore.QTextCodec.availableMibs(): - codec = QtCore.QTextCodec.codecForMib(mib) - sortKey = codec_name(codec).upper() - rank = 0 - - if sortKey.startswith('UTF-8'): - rank = 1 - elif sortKey.startswith('UTF-16'): - rank = 2 - elif iso8859RegExp.exactMatch(sortKey): - if len(iso8859RegExp.cap(1)) == 1: - rank = 3 - else: - rank = 4 - else: - rank = 5 - - codecMap.append((str(rank) + sortKey, codec)) - - codecMap.sort() - self.codecs = [item[-1] for item in codecMap] - - def createActions(self): - self.openAct = QtWidgets.QAction("&Open...", self, shortcut="Ctrl+O", - triggered=self.open) - - for codec in self.codecs: - name = codec_name(codec) - - action = QtWidgets.QAction(name + '...', self, triggered=self.save) - action.setData(name) - self.saveAsActs.append(action) - - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", - triggered=self.close) - - self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about) - - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, - triggered=qApp.aboutQt) - - def createMenus(self): - self.saveAsMenu = QtWidgets.QMenu("&Save As", self) - for action in self.saveAsActs: - self.saveAsMenu.addAction(action) - - self.saveAsMenu.aboutToShow.connect(self.aboutToShowSaveAsMenu) - - self.fileMenu = QtWidgets.QMenu("&File", self) - self.fileMenu.addAction(self.openAct) - self.fileMenu.addMenu(self.saveAsMenu) - self.fileMenu.addSeparator() - self.fileMenu.addAction(self.exitAct) - - self.helpMenu = QtWidgets.QMenu("&Help", self) - self.helpMenu.addAction(self.aboutAct) - self.helpMenu.addAction(self.aboutQtAct) - - self.menuBar().addMenu(self.fileMenu) - self.menuBar().addSeparator() - self.menuBar().addMenu(self.helpMenu) - - -class PreviewForm(QtWidgets.QDialog): - def __init__(self, parent): - super(PreviewForm, self).__init__(parent) - - self.encodingComboBox = QtWidgets.QComboBox() - encodingLabel = QtWidgets.QLabel("&Encoding:") - encodingLabel.setBuddy(self.encodingComboBox) - - self.textEdit = QtWidgets.QTextEdit() - self.textEdit.setLineWrapMode(QtWidgets.QTextEdit.NoWrap) - self.textEdit.setReadOnly(True) - - buttonBox = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel) - - self.encodingComboBox.activated.connect(self.updateTextEdit) - buttonBox.accepted.connect(self.accept) - buttonBox.rejected.connect(self.reject) - - mainLayout = QtWidgets.QGridLayout() - mainLayout.addWidget(encodingLabel, 0, 0) - mainLayout.addWidget(self.encodingComboBox, 0, 1) - mainLayout.addWidget(self.textEdit, 1, 0, 1, 2) - mainLayout.addWidget(buttonBox, 2, 0, 1, 2) - self.setLayout(mainLayout) - - self.setWindowTitle("Choose Encoding") - self.resize(400, 300) - - def setCodecList(self, codecs): - self.encodingComboBox.clear() - for codec in codecs: - self.encodingComboBox.addItem(codec_name(codec), codec.mibEnum()) - - def setEncodedData(self, data): - self.encodedData = data - self.updateTextEdit() - - def decodedString(self): - return self.decodedStr - - def updateTextEdit(self): - mib = self.encodingComboBox.itemData(self.encodingComboBox.currentIndex()) - codec = QtCore.QTextCodec.codecForMib(mib) - - data = QtCore.QTextStream(self.encodedData) - data.setAutoDetectUnicode(False) - data.setCodec(codec) - - self.decodedStr = data.readAll() - self.textEdit.setPlainText(self.decodedStr) - - -if __name__ == '__main__': - - import sys - - app = QtWidgets.QApplication(sys.argv) - mainWin = MainWindow() - mainWin.show() - sys.exit(app.exec_()) diff --git a/examples/corelib/tools/settingseditor/settingseditor.py b/examples/corelib/tools/settingseditor/settingseditor.py index 4cd262568..5b141880a 100644 --- a/examples/corelib/tools/settingseditor/settingseditor.py +++ b/examples/corelib/tools/settingseditor/settingseditor.py @@ -111,41 +111,41 @@ class MainWindow(QtWidgets.QMainWindow): "application settings using Qt.") def createActions(self): - self.openSettingsAct = QtWidgets.QAction("&Open Application Settings...", + self.openSettingsAct = QtGui.QAction("&Open Application Settings...", self, shortcut="Ctrl+O", triggered=self.openSettings) - self.openIniFileAct = QtWidgets.QAction("Open I&NI File...", self, + self.openIniFileAct = QtGui.QAction("Open I&NI File...", self, shortcut="Ctrl+N", triggered=self.openIniFile) - self.openPropertyListAct = QtWidgets.QAction("Open macOS &Property List...", + self.openPropertyListAct = QtGui.QAction("Open macOS &Property List...", self, shortcut="Ctrl+P", triggered=self.openPropertyList) if sys.platform != 'darwin': self.openPropertyListAct.setEnabled(False) - self.openRegistryPathAct = QtWidgets.QAction( + self.openRegistryPathAct = QtGui.QAction( "Open Windows &Registry Path...", self, shortcut="Ctrl+G", triggered=self.openRegistryPath) if sys.platform != 'win32': self.openRegistryPathAct.setEnabled(False) - self.refreshAct = QtWidgets.QAction("&Refresh", self, shortcut="Ctrl+R", + self.refreshAct = QtGui.QAction("&Refresh", self, shortcut="Ctrl+R", enabled=False, triggered=self.settingsTree.refresh) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", triggered=self.close) - self.autoRefreshAct = QtWidgets.QAction("&Auto-Refresh", self, + self.autoRefreshAct = QtGui.QAction("&Auto-Refresh", self, shortcut="Ctrl+A", checkable=True, enabled=False) self.autoRefreshAct.triggered[bool].connect(self.settingsTree.setAutoRefresh) self.autoRefreshAct.triggered[bool].connect(self.refreshAct.setDisabled) - self.fallbacksAct = QtWidgets.QAction("&Fallbacks", self, + self.fallbacksAct = QtGui.QAction("&Fallbacks", self, shortcut="Ctrl+F", checkable=True, enabled=False) self.fallbacksAct.triggered[bool].connect(self.settingsTree.setFallbacksEnabled) - self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about) + self.aboutAct = QtGui.QAction("&About", self, triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, triggered=qApp.aboutQt) def createMenus(self): diff --git a/examples/external/matplotlib/widget_3dplot.py b/examples/external/matplotlib/widget_3dplot.py index b96405661..6f47da31b 100644 --- a/examples/external/matplotlib/widget_3dplot.py +++ b/examples/external/matplotlib/widget_3dplot.py @@ -45,8 +45,8 @@ from matplotlib.backends.backend_qt5agg import FigureCanvas from matplotlib.figure import Figure from mpl_toolkits.mplot3d import axes3d from PySide2.QtCore import Qt, Slot -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import (QAction, QApplication, QComboBox, QHBoxLayout, +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import (QApplication, QComboBox, QHBoxLayout, QHeaderView, QLabel, QMainWindow, QSlider, QTableWidget, QTableWidgetItem, QVBoxLayout, QWidget) diff --git a/examples/external/opencv/webcam_pattern_detection.py b/examples/external/opencv/webcam_pattern_detection.py index 553261615..664ba2111 100644 --- a/examples/external/opencv/webcam_pattern_detection.py +++ b/examples/external/opencv/webcam_pattern_detection.py @@ -44,8 +44,8 @@ import time import cv2 from PySide2.QtCore import Qt, QThread, Signal, Slot -from PySide2.QtGui import QImage, QKeySequence, QPixmap -from PySide2.QtWidgets import (QAction, QApplication, QComboBox, QGroupBox, +from PySide2.QtGui import QAction, QImage, QKeySequence, QPixmap +from PySide2.QtWidgets import (QApplication, QComboBox, QGroupBox, QHBoxLayout, QLabel, QMainWindow, QPushButton, QSizePolicy, QVBoxLayout, QWidget) diff --git a/examples/external/scikit/staining_colors_separation.py b/examples/external/scikit/staining_colors_separation.py index 051b2bc25..d21453927 100644 --- a/examples/external/scikit/staining_colors_separation.py +++ b/examples/external/scikit/staining_colors_separation.py @@ -45,8 +45,8 @@ from matplotlib.backends.backend_qt5agg import FigureCanvas from matplotlib.colors import LinearSegmentedColormap from matplotlib.figure import Figure from PySide2.QtCore import Qt, Slot -from PySide2.QtGui import QKeySequence -from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel, +from PySide2.QtGui import QAction, QKeySequence +from PySide2.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMainWindow, QPushButton, QSizePolicy, QVBoxLayout, QWidget) from skimage import data diff --git a/examples/multimedia/camera.py b/examples/multimedia/camera.py index d58b526d9..644b5340c 100644 --- a/examples/multimedia/camera.py +++ b/examples/multimedia/camera.py @@ -43,9 +43,9 @@ import os, sys from PySide2.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl -from PySide2.QtGui import QGuiApplication, QDesktopServices, QIcon +from PySide2.QtGui import QAction, QGuiApplication, QDesktopServices, QIcon from PySide2.QtGui import QImage, QPixmap -from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel, +from PySide2.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget) from PySide2.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo from PySide2.QtMultimediaWidgets import QCameraViewfinder diff --git a/examples/multimedia/player.py b/examples/multimedia/player.py index 454f852ce..762d26b7e 100644 --- a/examples/multimedia/player.py +++ b/examples/multimedia/player.py @@ -43,8 +43,8 @@ import sys from PySide2.QtCore import QStandardPaths, Qt -from PySide2.QtGui import QIcon, QKeySequence -from PySide2.QtWidgets import (QAction, QApplication, QDialog, QFileDialog, +from PySide2.QtGui import QAction, QIcon, QKeySequence +from PySide2.QtWidgets import (QApplication, QDialog, QFileDialog, QMainWindow, QSlider, QStyle, QToolBar) from PySide2.QtMultimedia import QMediaPlayer, QMediaPlaylist from PySide2.QtMultimediaWidgets import QVideoWidget diff --git a/examples/opengl/grabber.py b/examples/opengl/grabber.py index d4b625718..9b5358a85 100644 --- a/examples/opengl/grabber.py +++ b/examples/opengl/grabber.py @@ -355,21 +355,21 @@ class MainWindow(QtWidgets.QMainWindow): "rendering OpenGL into a Qt pixmap.") def createActions(self): - self.renderIntoPixmapAct = QtWidgets.QAction("&Render into Pixmap...", + self.renderIntoPixmapAct = QtGui.QAction("&Render into Pixmap...", self, shortcut="Ctrl+R", triggered=self.renderIntoPixmap) - self.grabFrameBufferAct = QtWidgets.QAction("&Grab Frame Buffer", self, + self.grabFrameBufferAct = QtGui.QAction("&Grab Frame Buffer", self, shortcut="Ctrl+G", triggered=self.grabFrameBuffer) - self.clearPixmapAct = QtWidgets.QAction("&Clear Pixmap", self, + self.clearPixmapAct = QtGui.QAction("&Clear Pixmap", self, shortcut="Ctrl+L", triggered=self.clearPixmap) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", triggered=self.close) - self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about) + self.aboutAct = QtGui.QAction("&About", self, triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, triggered=qApp.aboutQt) def createMenus(self): diff --git a/examples/scriptableapplication/mainwindow.cpp b/examples/scriptableapplication/mainwindow.cpp index ef4a2f2e0..0811990de 100644 --- a/examples/scriptableapplication/mainwindow.cpp +++ b/examples/scriptableapplication/mainwindow.cpp @@ -51,7 +51,7 @@ #include "mainwindow.h" #include "pythonutils.h" -#include +#include #include #include #include diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index 438dd5c9d..086946bac 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -49,8 +49,8 @@ from findtoolbar import FindToolBar from webengineview import WebEngineView from PySide2 import QtCore from PySide2.QtCore import Qt, QUrl -from PySide2.QtGui import QKeySequence, QIcon -from PySide2.QtWidgets import (QAction, QApplication, QDockWidget, QLabel, +from PySide2.QtGui import QAction, QKeySequence, QIcon +from PySide2.QtWidgets import (QApplication, QDockWidget, QLabel, QLineEdit, QMainWindow, QToolBar) from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py index 3890782c4..048681bdb 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.py +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py @@ -607,38 +607,38 @@ class MainWindow(QtWidgets.QMainWindow): self.toolBox.addItem(backgroundWidget, "Backgrounds") def createActions(self): - self.toFrontAction = QtWidgets.QAction( + self.toFrontAction = QtGui.QAction( QtGui.QIcon(':/images/bringtofront.png'), "Bring to &Front", self, shortcut="Ctrl+F", statusTip="Bring item to front", triggered=self.bringToFront) - self.sendBackAction = QtWidgets.QAction( + self.sendBackAction = QtGui.QAction( QtGui.QIcon(':/images/sendtoback.png'), "Send to &Back", self, shortcut="Ctrl+B", statusTip="Send item to back", triggered=self.sendToBack) - self.deleteAction = QtWidgets.QAction(QtGui.QIcon(':/images/delete.png'), + self.deleteAction = QtGui.QAction(QtGui.QIcon(':/images/delete.png'), "&Delete", self, shortcut="Delete", statusTip="Delete item from diagram", triggered=self.deleteItem) - self.exitAction = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+X", + self.exitAction = QtGui.QAction("E&xit", self, shortcut="Ctrl+X", statusTip="Quit Scenediagram example", triggered=self.close) - self.boldAction = QtWidgets.QAction(QtGui.QIcon(':/images/bold.png'), + self.boldAction = QtGui.QAction(QtGui.QIcon(':/images/bold.png'), "Bold", self, checkable=True, shortcut="Ctrl+B", triggered=self.handleFontChange) - self.italicAction = QtWidgets.QAction(QtGui.QIcon(':/images/italic.png'), + self.italicAction = QtGui.QAction(QtGui.QIcon(':/images/italic.png'), "Italic", self, checkable=True, shortcut="Ctrl+I", triggered=self.handleFontChange) - self.underlineAction = QtWidgets.QAction( + self.underlineAction = QtGui.QAction( QtGui.QIcon(':/images/underline.png'), "Underline", self, checkable=True, shortcut="Ctrl+U", triggered=self.handleFontChange) - self.aboutAction = QtWidgets.QAction("A&bout", self, shortcut="Ctrl+B", + self.aboutAction = QtGui.QAction("A&bout", self, shortcut="Ctrl+B", triggered=self.about) def createMenus(self): @@ -780,7 +780,7 @@ class MainWindow(QtWidgets.QMainWindow): colorMenu = QtWidgets.QMenu(self) for color, name in zip(colors, names): - action = QtWidgets.QAction(self.createColorIcon(color), name, self, + action = QtGui.QAction(self.createColorIcon(color), name, self, triggered=slot) action.setData(QtGui.QColor(color)) colorMenu.addAction(action) diff --git a/examples/widgets/itemviews/addressbook/addressbook.py b/examples/widgets/itemviews/addressbook/addressbook.py index 262027a64..35d095287 100644 --- a/examples/widgets/itemviews/addressbook/addressbook.py +++ b/examples/widgets/itemviews/addressbook/addressbook.py @@ -40,7 +40,8 @@ ## ############################################################################# -from PySide2.QtWidgets import (QMainWindow, QAction, QFileDialog, QApplication) +from PySide2.QtGui import QAction +from PySide2.QtWidgets import (QMainWindow, QFileDialog, QApplication) from addresswidget import AddressWidget diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index 8c4626f9b..d68e77b41 100644 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -106,46 +106,46 @@ class MainWindow(QtWidgets.QMainWindow): self.setWindowModified(self.textEdit.document().isModified()) def createActions(self): - self.newAct = QtWidgets.QAction(QtGui.QIcon(':/images/new.png'), "&New", + self.newAct = QtGui.QAction(QtGui.QIcon(':/images/new.png'), "&New", self, shortcut=QtGui.QKeySequence.New, statusTip="Create a new file", triggered=self.newFile) - self.openAct = QtWidgets.QAction(QtGui.QIcon(':/images/open.png'), + self.openAct = QtGui.QAction(QtGui.QIcon(':/images/open.png'), "&Open...", self, shortcut=QtGui.QKeySequence.Open, statusTip="Open an existing file", triggered=self.open) - self.saveAct = QtWidgets.QAction(QtGui.QIcon(':/images/save.png'), + self.saveAct = QtGui.QAction(QtGui.QIcon(':/images/save.png'), "&Save", self, shortcut=QtGui.QKeySequence.Save, statusTip="Save the document to disk", triggered=self.save) - self.saveAsAct = QtWidgets.QAction("Save &As...", self, + self.saveAsAct = QtGui.QAction("Save &As...", self, shortcut=QtGui.QKeySequence.SaveAs, statusTip="Save the document under a new name", triggered=self.saveAs) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", statusTip="Exit the application", triggered=self.close) - self.cutAct = QtWidgets.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t", + self.cutAct = QtGui.QAction(QtGui.QIcon(':/images/cut.png'), "Cu&t", self, shortcut=QtGui.QKeySequence.Cut, statusTip="Cut the current selection's contents to the clipboard", triggered=self.textEdit.cut) - self.copyAct = QtWidgets.QAction(QtGui.QIcon(':/images/copy.png'), + self.copyAct = QtGui.QAction(QtGui.QIcon(':/images/copy.png'), "&Copy", self, shortcut=QtGui.QKeySequence.Copy, statusTip="Copy the current selection's contents to the clipboard", triggered=self.textEdit.copy) - self.pasteAct = QtWidgets.QAction(QtGui.QIcon(':/images/paste.png'), + self.pasteAct = QtGui.QAction(QtGui.QIcon(':/images/paste.png'), "&Paste", self, shortcut=QtGui.QKeySequence.Paste, statusTip="Paste the clipboard's contents into the current selection", triggered=self.textEdit.paste) - self.aboutAct = QtWidgets.QAction("&About", self, + self.aboutAct = QtGui.QAction("&About", self, statusTip="Show the application's About box", triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, statusTip="Show the Qt library's About box", triggered=qApp.aboutQt) diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py index 53f6f7818..3f8e7dbf7 100644 --- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py +++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py @@ -43,10 +43,10 @@ """PySide2 port of the widgets/mainwindows/dockwidgets example from Qt v5.x, originating from PyQt""" from PySide2.QtCore import QDate, QFile, Qt, QTextStream -from PySide2.QtGui import (QFont, QIcon, QKeySequence, QTextCharFormat, - QTextCursor, QTextTableFormat) +from PySide2.QtGui import (QAction, QFont, QIcon, QKeySequence, + QTextCharFormat, QTextTableFormat) from PySide2.QtPrintSupport import QPrintDialog, QPrinter -from PySide2.QtWidgets import (QAction, QApplication, QDialog, QDockWidget, +from PySide2.QtWidgets import (QApplication, QDialog, QDockWidget, QFileDialog, QListWidget, QMainWindow, QMessageBox, QTextEdit) import dockwidgets_rc diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index 9daca826d..f9d90767e 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -44,8 +44,8 @@ from PySide2.QtCore import (QFile, QFileInfo, QPoint, QSettings, QSignalMapper, QSaveFile, QSize, QTextStream, Qt) -from PySide2.QtGui import QIcon, QKeySequence -from PySide2.QtWidgets import (QAction, QApplication, QFileDialog, QMainWindow, +from PySide2.QtGui import QAction, QIcon, QKeySequence +from PySide2.QtWidgets import (QApplication, QFileDialog, QMainWindow, QMdiArea, QMessageBox, QTextEdit, QWidget) import mdi_rc diff --git a/examples/widgets/systray/window.py b/examples/widgets/systray/window.py index ca65f04e1..634646327 100644 --- a/examples/widgets/systray/window.py +++ b/examples/widgets/systray/window.py @@ -39,8 +39,8 @@ ############################################################################# from PySide2.QtCore import Slot -from PySide2.QtGui import QIcon -from PySide2.QtWidgets import (QAction, QCheckBox, QComboBox, QDialog, +from PySide2.QtGui import QAction, QIcon +from PySide2.QtWidgets import (QCheckBox, QComboBox, QDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLineEdit, QMenu, QMessageBox, QPushButton, QSpinBox, QStyle, QSystemTrayIcon, QTextEdit, diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py index 20ec09e2d..f645bedce 100644 --- a/examples/xml/dombookmarks/dombookmarks.py +++ b/examples/xml/dombookmarks/dombookmarks.py @@ -100,18 +100,18 @@ class MainWindow(QtWidgets.QMainWindow): "DOM classes to read and write XML documents.") def createActions(self): - self.openAct = QtWidgets.QAction("&Open...", self, shortcut="Ctrl+O", + self.openAct = QtGui.QAction("&Open...", self, shortcut="Ctrl+O", triggered=self.open) - self.saveAsAct = QtWidgets.QAction("&Save As...", self, shortcut="Ctrl+S", + self.saveAsAct = QtGui.QAction("&Save As...", self, shortcut="Ctrl+S", triggered=self.saveAs) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", triggered=self.close) - self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about) + self.aboutAct = QtGui.QAction("&About", self, triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, triggered=qApp.aboutQt) def createMenus(self): diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index fed96b5cd..ae35e1116 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -26,7 +26,6 @@ macro(collect_optional_modules) # Collect all optional modules. set(ALL_OPTIONAL_MODULES Xml - XmlPatterns Help Multimedia MultimediaWidgets OpenGL @@ -39,8 +38,6 @@ set(ALL_OPTIONAL_MODULES QuickWidgets RemoteObjects Scxml - Script - ScriptTools Sensors SerialPort TextToSpeech @@ -179,8 +176,7 @@ macro(COLLECT_MODULE_IF_FOUND shortname) get_target_property(Qt6${shortname}_PRIVATE_INCLUDE_DIRS Qt6::${shortname}Private INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(Qt6${shortname}_LIBRARIES Qt6::${shortname} - INTERFACE_LINK_LIBRARIES) + set(Qt6${shortname}_LIBRARIES Qt::${shortname}) endif() else() if("${module_state}" STREQUAL "optional") diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 484f02f0d..254139aff 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_policy(VERSION 3.1) # Don't ignore targets that do not exist, inside add_dependencies calls. cmake_policy(SET CMP0046 NEW) -set (QT_MAJOR_VERSION 5) +set (QT_MAJOR_VERSION 6) project(pysidebindings) diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 20ed65a67..3820d439e 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -26,22 +26,26 @@ ${QtCore_GEN_DIR}/qbasicmutex_wrapper.cpp ${QtCore_GEN_DIR}/qbasictimer_wrapper.cpp ${QtCore_GEN_DIR}/qbitarray_wrapper.cpp ${QtCore_GEN_DIR}/qbuffer_wrapper.cpp +${QtCore_GEN_DIR}/qbytearray_frombase64result_wrapper.cpp ${QtCore_GEN_DIR}/qbytearray_wrapper.cpp ${QtCore_GEN_DIR}/qbytearraymatcher_wrapper.cpp -${QtCore_GEN_DIR}/qchildevent_wrapper.cpp +${QtCore_GEN_DIR}/qcalendar_wrapper.cpp +${QtCore_GEN_DIR}/qcalendar_yearmonthday_wrapper.cpp ${QtCore_GEN_DIR}/qcborarray_wrapper.cpp ${QtCore_GEN_DIR}/qcborerror_wrapper.cpp ${QtCore_GEN_DIR}/qcbormap_wrapper.cpp ${QtCore_GEN_DIR}/qcborparsererror_wrapper.cpp ${QtCore_GEN_DIR}/qcborstreamreader_wrapper.cpp -${QtCore_GEN_DIR}/qcborstringresultstring_wrapper.cpp -${QtCore_GEN_DIR}/qcborstringresultbytearray_wrapper.cpp ${QtCore_GEN_DIR}/qcborstreamwriter_wrapper.cpp +${QtCore_GEN_DIR}/qcborstringresultbytearray_wrapper.cpp +${QtCore_GEN_DIR}/qcborstringresultstring_wrapper.cpp ${QtCore_GEN_DIR}/qcborvalue_wrapper.cpp +${QtCore_GEN_DIR}/qchildevent_wrapper.cpp ${QtCore_GEN_DIR}/qcollator_wrapper.cpp ${QtCore_GEN_DIR}/qcollatorsortkey_wrapper.cpp ${QtCore_GEN_DIR}/qcommandlineoption_wrapper.cpp ${QtCore_GEN_DIR}/qcommandlineparser_wrapper.cpp +${QtCore_GEN_DIR}/qconcatenatetablesproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qcoreapplication_wrapper.cpp ${QtCore_GEN_DIR}/qcryptographichash_wrapper.cpp ${QtCore_GEN_DIR}/qdatastream_wrapper.cpp @@ -58,9 +62,9 @@ ${QtCore_GEN_DIR}/qeventloop_wrapper.cpp ${QtCore_GEN_DIR}/qeventtransition_wrapper.cpp ${QtCore_GEN_DIR}/qfactoryinterface_wrapper.cpp ${QtCore_GEN_DIR}/qfile_wrapper.cpp -${QtCore_GEN_DIR}/qfileselector_wrapper.cpp ${QtCore_GEN_DIR}/qfiledevice_wrapper.cpp ${QtCore_GEN_DIR}/qfileinfo_wrapper.cpp +${QtCore_GEN_DIR}/qfileselector_wrapper.cpp ${QtCore_GEN_DIR}/qfilesystemwatcher_wrapper.cpp ${QtCore_GEN_DIR}/qfinalstate_wrapper.cpp ${QtCore_GEN_DIR}/qgenericargument_wrapper.cpp @@ -68,13 +72,13 @@ ${QtCore_GEN_DIR}/qgenericreturnargument_wrapper.cpp ${QtCore_GEN_DIR}/qhistorystate_wrapper.cpp ${QtCore_GEN_DIR}/qidentityproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qiodevice_wrapper.cpp +${QtCore_GEN_DIR}/qitemselection_wrapper.cpp +${QtCore_GEN_DIR}/qitemselectionmodel_wrapper.cpp +${QtCore_GEN_DIR}/qitemselectionrange_wrapper.cpp ${QtCore_GEN_DIR}/qjsonarray_wrapper.cpp ${QtCore_GEN_DIR}/qjsondocument_wrapper.cpp ${QtCore_GEN_DIR}/qjsonparseerror_wrapper.cpp ${QtCore_GEN_DIR}/qjsonvalue_wrapper.cpp -${QtCore_GEN_DIR}/qitemselection_wrapper.cpp -${QtCore_GEN_DIR}/qitemselectionmodel_wrapper.cpp -${QtCore_GEN_DIR}/qitemselectionrange_wrapper.cpp ${QtCore_GEN_DIR}/qlibraryinfo_wrapper.cpp ${QtCore_GEN_DIR}/qline_wrapper.cpp ${QtCore_GEN_DIR}/qlinef_wrapper.cpp @@ -107,13 +111,13 @@ ${QtCore_GEN_DIR}/qpointf_wrapper.cpp ${QtCore_GEN_DIR}/qprocess_wrapper.cpp ${QtCore_GEN_DIR}/qprocessenvironment_wrapper.cpp ${QtCore_GEN_DIR}/qpropertyanimation_wrapper.cpp -${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp ${QtCore_GEN_DIR}/qrandomgenerator64_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp ${QtCore_GEN_DIR}/qreadlocker_wrapper.cpp ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp ${QtCore_GEN_DIR}/qrectf_wrapper.cpp -${QtCore_GEN_DIR}/qregexp_wrapper.cpp +${QtCore_GEN_DIR}/qrecursivemutex_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpression_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpressionmatch_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpressionmatchiterator_wrapper.cpp @@ -132,8 +136,8 @@ ${QtCore_GEN_DIR}/qsizef_wrapper.cpp ${QtCore_GEN_DIR}/qsocketdescriptor_wrapper.cpp ${QtCore_GEN_DIR}/qsocketnotifier_wrapper.cpp ${QtCore_GEN_DIR}/qsortfilterproxymodel_wrapper.cpp -${QtCore_GEN_DIR}/qstate_wrapper.cpp ${QtCore_GEN_DIR}/qstandardpaths_wrapper.cpp +${QtCore_GEN_DIR}/qstate_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_signalevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrappedevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrapper.cpp @@ -145,10 +149,6 @@ ${QtCore_GEN_DIR}/qt_wrapper.cpp ${QtCore_GEN_DIR}/qtemporarydir_wrapper.cpp ${QtCore_GEN_DIR}/qtemporaryfile_wrapper.cpp ${QtCore_GEN_DIR}/qtextboundaryfinder_wrapper.cpp -${QtCore_GEN_DIR}/qtextcodec_converterstate_wrapper.cpp -${QtCore_GEN_DIR}/qtextcodec_wrapper.cpp -${QtCore_GEN_DIR}/qtextdecoder_wrapper.cpp -${QtCore_GEN_DIR}/qtextencoder_wrapper.cpp ${QtCore_GEN_DIR}/qtextstream_wrapper.cpp ${QtCore_GEN_DIR}/qtextstreammanipulator_wrapper.cpp ${QtCore_GEN_DIR}/qthread_wrapper.cpp @@ -157,9 +157,10 @@ ${QtCore_GEN_DIR}/qtime_wrapper.cpp ${QtCore_GEN_DIR}/qtimeline_wrapper.cpp ${QtCore_GEN_DIR}/qtimer_wrapper.cpp ${QtCore_GEN_DIR}/qtimerevent_wrapper.cpp -${QtCore_GEN_DIR}/qtimezone_wrapper.cpp ${QtCore_GEN_DIR}/qtimezone_offsetdata_wrapper.cpp +${QtCore_GEN_DIR}/qtimezone_wrapper.cpp ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp +${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qurl_wrapper.cpp ${QtCore_GEN_DIR}/qurlquery_wrapper.cpp ${QtCore_GEN_DIR}/quuid_wrapper.cpp @@ -176,33 +177,11 @@ ${QtCore_GEN_DIR}/qxmlstreamnotationdeclaration_wrapper.cpp ${QtCore_GEN_DIR}/qxmlstreamreader_wrapper.cpp ${QtCore_GEN_DIR}/qxmlstreamwriter_wrapper.cpp - ${SPECIFIC_OS_FILES} # module is always needed ${QtCore_GEN_DIR}/qtcore_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.13.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.13.0) - list(APPEND QtCore_SRC - ${QtCore_GEN_DIR}/qconcatenatetablesproxymodel_wrapper.cpp - ${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp) -endif() - -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.14.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.14.0) - list(APPEND QtCore_SRC - ${QtCore_GEN_DIR}/qcalendar_wrapper.cpp - ${QtCore_GEN_DIR}/qcalendar_yearmonthday_wrapper.cpp - ${QtCore_GEN_DIR}/qrecursivemutex_wrapper.cpp) -endif() - -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.15.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.15.0) - list(APPEND QtCore_SRC - ${QtCore_GEN_DIR}/qbytearray_frombase64result_wrapper.cpp) -endif() - set(QtCore_glue_sources "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.cpp" "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.h" diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 986356720..720cddcc6 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -170,7 +170,6 @@ - @@ -189,6 +188,8 @@ + + @@ -354,7 +355,7 @@ - + @@ -405,6 +406,7 @@ + @@ -419,21 +421,6 @@ - - - - - - - - - - - - - - - @@ -462,20 +449,6 @@ - - - - - - - - - - - - - - @@ -634,6 +607,7 @@ + @@ -827,7 +801,6 @@ - @@ -848,7 +821,7 @@ - + @@ -1310,8 +1283,6 @@ - - @@ -1324,8 +1295,6 @@ - - @@ -1338,8 +1307,6 @@ - - @@ -1352,8 +1319,6 @@ - - @@ -1366,8 +1331,6 @@ - - @@ -1379,8 +1342,6 @@ - - @@ -1392,8 +1353,6 @@ - - @@ -1405,8 +1364,6 @@ - - @@ -1505,7 +1462,7 @@ - + @@ -1586,10 +1543,6 @@ - - - - @@ -1731,12 +1684,6 @@ - - - - - - @@ -1819,64 +1766,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Replaces every occurrence of the regular expression in *sourceString* with *after*. - Returns a new Python string with the modified contents. For example: - - :: - - s = "Banana" - re = QRegExp("a[mn]") - s = re.replace(s, "ox") - # s == "Boxoxa" - - - For regular expressions containing capturing parentheses, occurrences of \1, \2, ..., in *after* - are replaced with rx.cap(1), cap(2), ... - - :: - - t = "A <i>bon mot</i>." - re = QRegExp("<i>([^<]*)</i>") - t = re.replace(t, "\\emph{\\1}") - # t == "A \\emph{bon mot}." - - - - - - + @@ -1918,56 +1809,41 @@ - - - - - - - - - - - - - - - @@ -2053,7 +1929,6 @@ - @@ -2196,7 +2071,7 @@ - + @@ -2310,7 +2185,7 @@ - + @@ -2406,38 +2281,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2493,7 +2336,6 @@ - @@ -2508,10 +2350,6 @@ - - - - @@ -2590,12 +2428,6 @@ - - - - - - @@ -2882,11 +2714,6 @@ - - - - - diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index dcc5e29cf..f574b8081 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -1,10 +1,6 @@ project(QtGui) -if (${QT_MAJOR_VERSION} GREATER_EQUAL 6) - qt6_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") -else() - qt5_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") -endif() +qt_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") set(QtGui_DROPPED_ENTRIES) @@ -12,7 +8,6 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui PROPERTY QT_ENABLED_PUBLIC_FEATURES) set(QtGui_SRC -${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_selection_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_wrapper.cpp @@ -31,13 +26,16 @@ ${QtGui_GEN_DIR}/qaccessibletextselectionevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessibletextupdateevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessiblevaluechangeevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessiblevalueinterface_wrapper.cpp +${QtGui_GEN_DIR}/qaction_wrapper.cpp ${QtGui_GEN_DIR}/qactionevent_wrapper.cpp +${QtGui_GEN_DIR}/qactiongroup_wrapper.cpp ${QtGui_GEN_DIR}/qbackingstore_wrapper.cpp ${QtGui_GEN_DIR}/qbitmap_wrapper.cpp ${QtGui_GEN_DIR}/qbrush_wrapper.cpp ${QtGui_GEN_DIR}/qclipboard_wrapper.cpp ${QtGui_GEN_DIR}/qcloseevent_wrapper.cpp ${QtGui_GEN_DIR}/qcolor_wrapper.cpp +${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp ${QtGui_GEN_DIR}/qconicalgradient_wrapper.cpp ${QtGui_GEN_DIR}/qcontextmenuevent_wrapper.cpp ${QtGui_GEN_DIR}/qcursor_wrapper.cpp @@ -70,6 +68,7 @@ ${QtGui_GEN_DIR}/qimage_wrapper.cpp ${QtGui_GEN_DIR}/qimageiohandler_wrapper.cpp ${QtGui_GEN_DIR}/qimagereader_wrapper.cpp ${QtGui_GEN_DIR}/qimagewriter_wrapper.cpp +${QtGui_GEN_DIR}/qinputdevice_wrapper.cpp ${QtGui_GEN_DIR}/qinputevent_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethod_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethodevent_attribute_wrapper.cpp @@ -79,7 +78,6 @@ ${QtGui_GEN_DIR}/qintvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qkeyevent_wrapper.cpp ${QtGui_GEN_DIR}/qkeysequence_wrapper.cpp ${QtGui_GEN_DIR}/qlineargradient_wrapper.cpp -${QtGui_GEN_DIR}/qmatrix_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x2_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x3_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x4_wrapper.cpp @@ -95,20 +93,8 @@ ${QtGui_GEN_DIR}/qmovie_wrapper.cpp ${QtGui_GEN_DIR}/qnativegestureevent_wrapper.cpp ${QtGui_GEN_DIR}/qoffscreensurface_wrapper.cpp ${QtGui_GEN_DIR}/qopenglcontextgroup_wrapper.cpp -${QtGui_GEN_DIR}/qopengldebuglogger_wrapper.cpp -${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp ${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp -${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp -# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp -${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp -${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp -${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp -${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp -${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp -${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp -${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp -${QtGui_GEN_DIR}/qopenglwindow_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_margins_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpagelayout_wrapper.cpp @@ -127,18 +113,18 @@ ${QtGui_GEN_DIR}/qpalette_wrapper.cpp ${QtGui_GEN_DIR}/qpdfwriter_wrapper.cpp ${QtGui_GEN_DIR}/qpen_wrapper.cpp ${QtGui_GEN_DIR}/qpicture_wrapper.cpp -${QtGui_GEN_DIR}/qpictureio_wrapper.cpp ${QtGui_GEN_DIR}/qpixmap_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_key_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_wrapper.cpp ${QtGui_GEN_DIR}/qpixelformat_wrapper.cpp +${QtGui_GEN_DIR}/qpointerevent_wrapper.cpp +${QtGui_GEN_DIR}/qpointingdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpointingdeviceuniqueid_wrapper.cpp ${QtGui_GEN_DIR}/qpolygon_wrapper.cpp ${QtGui_GEN_DIR}/qpolygonf_wrapper.cpp ${QtGui_GEN_DIR}/qpytextobject_wrapper.cpp ${QtGui_GEN_DIR}/qquaternion_wrapper.cpp ${QtGui_GEN_DIR}/qradialgradient_wrapper.cpp -${QtGui_GEN_DIR}/qregexpvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qregularexpressionvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qregion_wrapper.cpp ${QtGui_GEN_DIR}/qresizeevent_wrapper.cpp @@ -148,14 +134,11 @@ ${QtGui_GEN_DIR}/qshowevent_wrapper.cpp ${QtGui_GEN_DIR}/qstandarditem_wrapper.cpp ${QtGui_GEN_DIR}/qstandarditemmodel_wrapper.cpp ${QtGui_GEN_DIR}/qstatustipevent_wrapper.cpp -${QtGui_GEN_DIR}/qopenglbuffer_wrapper.cpp ${QtGui_GEN_DIR}/qopenglcontext_wrapper.cpp ${QtGui_GEN_DIR}/qaccessible_state_wrapper.cpp ${QtGui_GEN_DIR}/qaccessibleinterface_wrapper.cpp ${QtGui_GEN_DIR}/qscreen_wrapper.cpp -${QtGui_GEN_DIR}/qopenglshader_wrapper.cpp -#${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp -${QtGui_GEN_DIR}/qopenglframebufferobject_wrapper.cpp +${QtGui_GEN_DIR}/qshortcut_wrapper.cpp ${QtGui_GEN_DIR}/qrasterwindow_wrapper.cpp ${QtGui_GEN_DIR}/qrawfont_wrapper.cpp ${QtGui_GEN_DIR}/qscrollevent_wrapper.cpp @@ -199,11 +182,13 @@ ${QtGui_GEN_DIR}/qtexttablecell_wrapper.cpp ${QtGui_GEN_DIR}/qtexttablecellformat_wrapper.cpp ${QtGui_GEN_DIR}/qtexttableformat_wrapper.cpp ${QtGui_GEN_DIR}/qtoolbarchangeevent_wrapper.cpp -${QtGui_GEN_DIR}/qtouchdevice_wrapper.cpp ${QtGui_GEN_DIR}/qtouchevent_touchpoint_wrapper.cpp ${QtGui_GEN_DIR}/qtouchevent_wrapper.cpp ${QtGui_GEN_DIR}/qtransform_wrapper.cpp ${QtGui_GEN_DIR}/qt_wrapper.cpp +${QtGui_GEN_DIR}/qundocommand_wrapper.cpp +${QtGui_GEN_DIR}/qundogroup_wrapper.cpp +${QtGui_GEN_DIR}/qundostack_wrapper.cpp ${QtGui_GEN_DIR}/qvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qvector2d_wrapper.cpp ${QtGui_GEN_DIR}/qvector3d_wrapper.cpp @@ -216,24 +201,6 @@ ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Gui_VERSION VERSION_EQUAL 5.14.0 - OR Qt${QT_MAJOR_VERSION}Gui_VERSION VERSION_GREATER 5.14.0) - list(APPEND QtGui_SRC ${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp) -endif() - -# cf qtbase/src/gui/opengl/opengl.pri -list(FIND QtGui_enabled_features "opengles2" _opengles2Index) -# ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features) -if(_opengles2Index GREATER -1) - list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) - message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)") -else() - list(APPEND QtGui_SRC - ${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp - ${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp) - message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Adding Desktop OpenGL classes") -endif() - configure_file("${QtGui_SOURCE_DIR}/typesystem_gui.xml.in" "${QtGui_BINARY_DIR}/typesystem_gui.xml" @ONLY) diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 4be4fc8f3..3819c2a42 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -247,6 +247,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -405,10 +441,10 @@ - - - - + + + + @@ -501,7 +537,6 @@ - @@ -527,7 +562,6 @@ - @@ -655,70 +689,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -756,7 +726,6 @@ - @@ -764,7 +733,7 @@ - + @@ -801,7 +770,7 @@ - + @@ -909,7 +878,7 @@ - + @@ -936,7 +905,7 @@ - + @@ -1120,7 +1089,7 @@ - + @@ -1156,7 +1125,7 @@ - + @@ -1258,15 +1227,6 @@ - - - - - - - - - @@ -1274,7 +1234,6 @@ - @@ -1454,10 +1413,7 @@ - - - - + @@ -1476,6 +1432,7 @@ + @@ -1892,14 +1849,6 @@ - - - - - - - - @@ -1915,16 +1864,6 @@ - - - - - - - - - - @@ -2258,6 +2197,7 @@ + - + @@ -2578,29 +2518,10 @@ - - - - - - - - - - - - - - - - - - - @@ -2887,7 +2808,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3030,6 +2858,9 @@ + + + @@ -3051,4 +2882,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 9557c4a26..fca44d92c 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -23,8 +23,6 @@ ${QtNetwork_GEN_DIR}/qlocalsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkaccessmanager_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkaddressentry_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcachemetadata_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworkconfiguration_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworkconfigurationmanager_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcookie_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcookiejar_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkdatagram_wrapper.cpp @@ -35,7 +33,6 @@ ${QtNetwork_GEN_DIR}/qnetworkproxyfactory_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkproxyquery_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkreply_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkrequest_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworksession_wrapper.cpp ${QtNetwork_GEN_DIR}/qpassworddigestor_wrapper.cpp ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index dc60a509d..f078b9bf7 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -42,6 +42,8 @@ + + @@ -53,6 +55,8 @@ + + @@ -172,7 +176,6 @@ - @@ -262,21 +265,6 @@ - - - - - - - - - - - - - - - diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp index efc86a048..4218678bf 100644 --- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp +++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp @@ -132,7 +132,6 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, Q_ASSERT(metaObject); QQmlPrivate::RegisterType type; - type.version = 0; // Allow registering Qt Quick items. bool registered = false; @@ -153,8 +152,8 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, pyTypes[nextType] = pyObj; // FIXME: Fix this to assign new type ids each time. - type.typeId = qMetaTypeId(); - type.listId = qMetaTypeId >(); + type.typeId = QMetaType(QMetaType::QObjectStar); + type.listId = QMetaType::fromType >(); type.attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc(); type.attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject(); @@ -170,8 +169,7 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, type.objectSize = objectSize; type.create = createFuncs[nextType]; type.uri = uri; - type.versionMajor = versionMajor; - type.versionMinor = versionMinor; + type.version = QTypeRevision::fromVersion(versionMajor, versionMinor); type.elementName = qmlName; type.extensionObjectCreate = 0; diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index b61b28c07..4ebc4b417 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -54,9 +54,18 @@ in generator tests folder. --> + + + + This function registers the Python type in the QML system with the name qmlName, in the library imported from uri having the version number composed from versionMajor and versionMinor. @@ -93,6 +102,7 @@ + @@ -116,7 +126,6 @@ - @@ -153,10 +162,11 @@ - + + The replace type is needed to use the VolatileBool_Check macro instead of + a template conversion function with "volatile bool" as argument. volatile bool * %out = @@ -164,6 +174,7 @@ + --> diff --git a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in index 65daf1b84..da5534b82 100644 --- a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in @@ -1,5 +1,5 @@ // QT_WIDGETS_LIB changes code generation in pysideqtesttouch.h -#if @Qt5Widgets_FOUND@ +#if @Qt6Widgets_FOUND@ # define QT_WIDGETS_LIB #endif diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index f7facaf7d..b22289149 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -89,14 +89,14 @@ The problem that costed my days of bug hunting is the fact that shiboken gives misleading error messages. The messages that I could not get rid of were - signature 'generateTouchEvent(QWidget*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: - signature 'generateTouchEvent(QWindow*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: + signature 'generateTouchEvent(QWidget*,QInputDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: + signature 'generateTouchEvent(QWindow*,QInputDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: I always thought that for some reason the functions were not recognized, or the arguments somehow do not match their declaration. Only late in the project, I learnt that also a simply missing type name in the argument list leads to this message. - + @@ -151,12 +151,12 @@ - + - + diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index 506a6fc78..5383d9410 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -9,8 +9,6 @@ ${QtWidgets_GEN_DIR}/qabstractitemview_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractscrollarea_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractslider_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractspinbox_wrapper.cpp -${QtWidgets_GEN_DIR}/qaction_wrapper.cpp -${QtWidgets_GEN_DIR}/qactiongroup_wrapper.cpp ${QtWidgets_GEN_DIR}/qapplication_wrapper.cpp ${QtWidgets_GEN_DIR}/qboxlayout_wrapper.cpp ${QtWidgets_GEN_DIR}/qbuttongroup_wrapper.cpp @@ -26,11 +24,9 @@ ${QtWidgets_GEN_DIR}/qcompleter_wrapper.cpp ${QtWidgets_GEN_DIR}/qdatawidgetmapper_wrapper.cpp ${QtWidgets_GEN_DIR}/qdateedit_wrapper.cpp ${QtWidgets_GEN_DIR}/qdatetimeedit_wrapper.cpp -${QtWidgets_GEN_DIR}/qdesktopwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qdial_wrapper.cpp ${QtWidgets_GEN_DIR}/qdialog_wrapper.cpp ${QtWidgets_GEN_DIR}/qdialogbuttonbox_wrapper.cpp -${QtWidgets_GEN_DIR}/qdirmodel_wrapper.cpp ${QtWidgets_GEN_DIR}/qdockwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qdoublespinbox_wrapper.cpp ${QtWidgets_GEN_DIR}/qerrormessage_wrapper.cpp @@ -109,7 +105,6 @@ ${QtWidgets_GEN_DIR}/qmenu_wrapper.cpp ${QtWidgets_GEN_DIR}/qmenubar_wrapper.cpp ${QtWidgets_GEN_DIR}/qmessagebox_wrapper.cpp ${QtWidgets_GEN_DIR}/qmouseeventtransition_wrapper.cpp -${QtWidgets_GEN_DIR}/qopenglwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qpangesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qpinchgesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qplaintextdocumentlayout_wrapper.cpp @@ -124,7 +119,6 @@ ${QtWidgets_GEN_DIR}/qscrollarea_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollbar_wrapper.cpp ${QtWidgets_GEN_DIR}/qscroller_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollerproperties_wrapper.cpp -${QtWidgets_GEN_DIR}/qshortcut_wrapper.cpp ${QtWidgets_GEN_DIR}/qsizegrip_wrapper.cpp ${QtWidgets_GEN_DIR}/qsizepolicy_wrapper.cpp ${QtWidgets_GEN_DIR}/qslider_wrapper.cpp @@ -190,9 +184,6 @@ ${QtWidgets_GEN_DIR}/qtreeview_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidgetitem_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidgetitemiterator_wrapper.cpp -${QtWidgets_GEN_DIR}/qundocommand_wrapper.cpp -${QtWidgets_GEN_DIR}/qundogroup_wrapper.cpp -${QtWidgets_GEN_DIR}/qundostack_wrapper.cpp ${QtWidgets_GEN_DIR}/qundoview_wrapper.cpp ${QtWidgets_GEN_DIR}/qvboxlayout_wrapper.cpp ${QtWidgets_GEN_DIR}/qwhatsthis_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index d2fc0705e..160082d07 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -235,7 +235,7 @@ - + @@ -461,19 +461,6 @@ - - - - - - - - - - - - - @@ -525,14 +512,6 @@ - - - - - - - - @@ -638,8 +617,6 @@ - - @@ -963,15 +940,6 @@ - - - - - - - - - @@ -1078,40 +1046,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1252,8 +1186,6 @@ - - @@ -1562,16 +1494,6 @@ - - - - - - - - - - @@ -2024,7 +1946,7 @@ - + @@ -2225,33 +2147,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2706,28 +2601,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -2738,9 +2611,6 @@ - - - @@ -2761,7 +2631,6 @@ - @@ -2782,7 +2651,7 @@ sys.exit(app.exec_()) - + :: @@ -2943,20 +2812,8 @@ - - - - - - - - - - - - diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index a0ca23662..6d8c0876d 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -647,8 +647,10 @@ if (%PYARG_0 == Py_None) // @snippet qline-hash namespace PySide { - template<> inline Py_ssize_t hash(const QLine &v) { - return qHash(qMakePair(qMakePair(v.x1(), v.y1()), qMakePair(v.x2(), v.y2()))); + template<> inline Py_ssize_t hash(const QLine &l) + { + const int v[4] = {l.x1(), l.y1(), l.x2(), l.y2()}; + return qHashRange(v, v + 4); } }; // @snippet qline-hash @@ -723,8 +725,9 @@ namespace PySide { // @snippet qrect namespace PySide { - template<> inline Py_ssize_t hash(const QRect &v) { - return qHash(qMakePair(qMakePair(v.x(), v.y()), qMakePair(v.width(), v.height()))); + template<> inline Py_ssize_t hash(const QRect &r) { + const int v[4] = {r.x(), r.y(), r.width(), r.height()}; + return qHashRange(v, v + 4); } }; // @snippet qrect @@ -801,11 +804,6 @@ static QObject *_findChildHelper(const QObject *parent, const QString &name, PyT return nullptr; } -static inline bool _findChildrenComparator(const QObject *&child, const QRegExp &name) -{ - return name.indexIn(child->objectName()) != -1; -} - static inline bool _findChildrenComparator(const QObject *&child, const QRegularExpression &name) { return name.match(child->objectName()).hasMatch(); diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp index a6b45b7c0..2a139fe69 100644 --- a/sources/pyside2/PySide2/glue/qtgui.cpp +++ b/sources/pyside2/PySide2/glue/qtgui.cpp @@ -144,7 +144,7 @@ for (int i = 0, i_max = %CPPSELF.count(); i < i_max; ++i){ // @snippet qpixmap // @snippet qimage-constbits -%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.byteCount()); +%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.sizeInBytes()); // @snippet qimage-constbits // @snippet qimage-bits diff --git a/sources/pyside2/PySide2/pysideqtesttouch.h b/sources/pyside2/PySide2/pysideqtesttouch.h index 115c7835e..7c08fbc02 100644 --- a/sources/pyside2/PySide2/pysideqtesttouch.h +++ b/sources/pyside2/PySide2/pysideqtesttouch.h @@ -142,12 +142,12 @@ namespace QTest private: #ifdef QT_WIDGETS_LIB - PySideQTouchEventSequence(QWidget *widget, QTouchDevice *aDevice, bool autoCommit) + PySideQTouchEventSequence(QWidget *widget, QInputDevice *aDevice, bool autoCommit) : targetWidget(widget), targetWindow(0), device(aDevice), commitWhenDestroyed(autoCommit) { } #endif - PySideQTouchEventSequence(QWindow *window, QTouchDevice *aDevice, bool autoCommit) + PySideQTouchEventSequence(QWindow *window, QInputDevice *aDevice, bool autoCommit) : #ifdef QT_WIDGETS_LIB targetWidget(0), @@ -195,18 +195,18 @@ private: QWidget *targetWidget; #endif QWindow *targetWindow; - QTouchDevice *device; + QInputDevice *device; bool commitWhenDestroyed; #ifdef QT_WIDGETS_LIB - friend PySideQTouchEventSequence *generateTouchEvent(QWidget *, QTouchDevice *, bool); + friend PySideQTouchEventSequence *generateTouchEvent(QWidget *, QInputDevice *, bool); #endif - friend PySideQTouchEventSequence *generateTouchEvent(QWindow *, QTouchDevice *, bool); + friend PySideQTouchEventSequence *generateTouchEvent(QWindow *, QInputDevice *, bool); }; #ifdef QT_WIDGETS_LIB inline PySideQTouchEventSequence *generateTouchEvent(QWidget *widget, - QTouchDevice *device, + QInputDevice *device, bool autoCommit = true) { return new PySideQTouchEventSequence(widget, device, autoCommit); @@ -214,7 +214,7 @@ private: #endif inline PySideQTouchEventSequence *generateTouchEvent(QWindow *window, - QTouchDevice *device, + QInputDevice *device, bool autoCommit = true) { return new PySideQTouchEventSequence(window, device, autoCommit); diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml index 6d02428ad..b6fb72a2f 100644 --- a/sources/pyside2/PySide2/templates/core_common.xml +++ b/sources/pyside2/PySide2/templates/core_common.xml @@ -242,8 +242,8 @@