From 5c3f6e3e50de4c41ded289111cd1e78fd9ec369b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 6 Apr 2018 15:55:36 +0200 Subject: Fix qt_attribution.json - Move from root to sources/pyside2/PySide2/support/signature - Set "QtForPython" as module name, fixing the qtattributionsscanner warning: File ./qt_attribution.json: Missing mandatory property 'QDocModule'. - Use "Qt for Python" as in descriptions - Reference backport_inspect.py as file Task-number: PYSIDE-363 Change-Id: I5e2b546a0a2a090abebc73a38ca4077a2983f216 Reviewed-by: Christian Tismer Reviewed-by: Cristian Maureira-Fredes --- .../pyside2/PySide2/support/signature/qt_attribution.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sources/pyside2/PySide2/support/signature/qt_attribution.json (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/support/signature/qt_attribution.json b/sources/pyside2/PySide2/support/signature/qt_attribution.json new file mode 100644 index 000000000..331b3e814 --- /dev/null +++ b/sources/pyside2/PySide2/support/signature/qt_attribution.json @@ -0,0 +1,12 @@ +{ + "Id": "python", + "Name": "Python", + "QDocModule": "QtForPython", + "QtUsage": "Used for Qt for Python in the signature extension.", + "Description": "Qt for Python is an add-on for Python. The signature packages of PySide uses certain copied and adapted source files (inspect.py, backport_inspect.py, typing27.py, typing36.py). See the folder sources/pyside2/PySide2/support/signature .", + "Homepage": "http://www.python.org/", + "Version": "3.6.5", + "License": "PSF LICENSE AGREEMENT FOR PYTHON 3.6.5", + "LicenseFile": "backport_inspect.py", + "Copyright": "© Copyright 2001-2018, Python Software Foundation." +} -- cgit v1.2.3 From 3895f37a83ba763cb54ea0af02282d4d7d54273b Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Thu, 29 Mar 2018 11:28:32 +0200 Subject: Update deprecated Qsql header Change-Id: I8e0a4e4c264c420304d29235e51190e1edac3ede Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/QtSql/typesystem_sql.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml index 46836ef96..2699f29d4 100644 --- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml +++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml @@ -52,7 +52,7 @@ - + -- cgit v1.2.3 From f93da21b3286db1bf693c26df47a538e581ff908 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Thu, 29 Mar 2018 11:13:57 +0200 Subject: Transfer ownership of new Widget to QTreeWidget When new widgets were added to a QTreeWidget the ownership was not being transferred. This problem happened when the Widget was being build inside the method call. When trying to show owner-less Widgets inside the Tree, a segfault happened. A test case was added. Task-number: PYSIDE-73 Change-Id: I0f1c3c065ae8ed0a336c8e39b1766f3e8870b54d Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 0555d9a53..5f7f42290 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -1902,6 +1902,11 @@ + + + + + -- cgit v1.2.3 From b5debb687463f77053344f1e4cd7754275e487b2 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 6 Apr 2018 16:28:22 +0200 Subject: Transfer ownership of the header to the QTreeView When using setHeader on a QTreeView, the view needs to take ownership of the header object. Task-number: PYSIDE-227 Change-Id: Ib37c00c098be422c7f0df4a32a6795c267642a41 Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 5f7f42290..e5e72dc65 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -1126,6 +1126,11 @@ + + + + + -- cgit v1.2.3 From 67d6c85a9dc17fe68ab399e14da73d10a1f9a351 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Thu, 29 Mar 2018 14:35:28 +0200 Subject: Check default superclass when getting baseClasses Reimplementing a class must respect the closest base class instead of falling back to QObject. By adding a default-superclass argument one can verify that field first when shiboken is getting the base classes. This problem was found by reimplementing QGraphicsObject including methods from one of its parent classes, QGraphicsItem. With this change, the generated wrapper will list all the base classes in `Sbk_QGraphicsObject_Type_bases` leaving QObject at the end, because if not, it will match inmediately. A test case was included. This change doesn't affect other existing tests. Task-number: PYSIDE-86 Change-Id: I6b9a220497b12c8085302a502f8581cc2d3fb11b Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index e5e72dc65..2899be47a 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -3641,7 +3641,7 @@ - + -- cgit v1.2.3 From ad69024a695a459e2953f477d90a64004c818ff5 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Thu, 29 Mar 2018 13:38:10 +0200 Subject: Remove white spaces from signature label in XMLs Change-Id: I2d41bb92335bcbd2300da29b793ce0529e57960a Reviewed-by: Friedemann Kleint Reviewed-by: Christian Tismer --- .../PySide2/QtCore/typesystem_core_common.xml | 244 ++++++++--------- .../PySide2/QtGui/typesystem_gui_common.xml | 164 +++++------ sources/pyside2/PySide2/QtHelp/typesystem_help.xml | 2 +- .../QtMultimedia/typesystem_multimedia_common.xml | 42 +-- .../PySide2/QtNetwork/typesystem_network.xml | 22 +- .../pyside2/PySide2/QtOpenGL/typesystem_opengl.xml | 82 +++--- .../QtPrintSupport/typesystem_printsupport.xml | 2 +- sources/pyside2/PySide2/QtQml/typesystem_qml.xml | 8 +- .../pyside2/PySide2/QtQuick/typesystem_quick.xml | 2 +- sources/pyside2/PySide2/QtSql/typesystem_sql.xml | 8 +- sources/pyside2/PySide2/QtSvg/typesystem_svg.xml | 4 +- sources/pyside2/PySide2/QtTest/typesystem_test.xml | 22 +- .../PySide2/QtUiTools/typesystem_uitools.xml | 12 +- .../QtWebKitWidgets/typesystem_webkitwidgets.xml | 6 +- .../QtWidgets/typesystem_widgets_common.xml | 302 ++++++++++----------- .../PySide2/QtWidgets/typesystem_widgets_mac.xml | 2 +- sources/pyside2/PySide2/QtXml/typesystem_xml.xml | 16 +- .../QtXmlPatterns/typesystem_xmlpatterns.xml | 6 +- 18 files changed, 473 insertions(+), 473 deletions(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index e4d16b2d3..6db3691a6 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -69,7 +69,7 @@ - + @@ -895,7 +895,7 @@ - + @@ -979,9 +979,9 @@ - - - + + + @@ -1188,7 +1188,7 @@ - + @@ -1228,7 +1228,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - + @@ -1236,7 +1236,7 @@ - + @@ -1377,7 +1377,7 @@ - + @@ -1387,7 +1387,7 @@ %0 = new %TYPE(date, time, Qt::TimeSpec(%8)); - + QDate date(%1, %2, %3); QTime time(%4, %5, %6); @@ -1777,7 +1777,7 @@ - + @@ -1821,19 +1821,19 @@ - - - + + + - + - + @@ -1990,7 +1990,7 @@ - + %CPPSELF.unlock(); @@ -2004,7 +2004,7 @@ - + %CPPSELF.unlock(); @@ -2032,14 +2032,14 @@ - - - + + + - + @@ -2064,13 +2064,13 @@ qRegisterMetaType<QVector<int> >("QVector<int>"); - + - + @@ -2079,14 +2079,14 @@ - + - + @@ -2096,7 +2096,7 @@ - + @@ -2111,7 +2111,7 @@ - + @@ -2120,7 +2120,7 @@ - + @@ -2128,7 +2128,7 @@ - + %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); @@ -2160,7 +2160,7 @@ - + @@ -2173,7 +2173,7 @@ - + @@ -2184,7 +2184,7 @@ - + @@ -2194,7 +2194,7 @@ %PYARG_0 = %CONVERTTOPYTHON[bool](%0); - + @@ -2205,7 +2205,7 @@ - + @@ -2217,7 +2217,7 @@ - + @@ -2228,7 +2228,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - + @@ -2239,21 +2239,21 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - - + + %RETURN_TYPE %0 = PySide::SignalManager::instance().emitSignal(%CPPSELF, %1, %PYARG_2); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - + // %FUNCTION_NAME() - disable generation of function call. %RETURN_TYPE %0 = qobjectDisconnectCallback(%CPPSELF, %1, %2); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - + // %FUNCTION_NAME() - disable generation of function call. %RETURN_TYPE %0 = qobjectDisconnectCallback(%1, %2, %3); @@ -2263,7 +2263,7 @@ - + QObject *child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1); %PYARG_0 = %CONVERTTOPYTHON[QObject*](child); @@ -2275,7 +2275,7 @@ - + %PYARG_0 = PyList_New(0); _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0); @@ -2287,7 +2287,7 @@ - + %PYARG_0 = PyList_New(0); _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0); @@ -2297,7 +2297,7 @@ - + @@ -2323,7 +2323,7 @@ - + // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife int ret = %CPPSELF.%FUNCTION_NAME(%1); @@ -2340,14 +2340,14 @@ - + - + @@ -2417,7 +2417,7 @@ - + @@ -2529,7 +2529,7 @@ - + @@ -2561,7 +2561,7 @@ } - + Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1)); if (!str.isNull()) { @@ -2571,7 +2571,7 @@ } - + QByteArray ba = QByteArray(PyBytes_AS_STRING(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1)) + *%CPPSELF; %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba); @@ -2603,7 +2603,7 @@ - + if (PyBytes_Check(%PYARG_1)) { @@ -2663,8 +2663,8 @@ - - + + @@ -2675,7 +2675,7 @@ - + @@ -2683,7 +2683,7 @@ - + @@ -2691,7 +2691,7 @@ - + @@ -2699,7 +2699,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2715,7 +2715,7 @@ - + @@ -2828,7 +2828,7 @@ - + @@ -2860,13 +2860,13 @@ - + - + - + @@ -2882,13 +2882,13 @@ - + - + - + - + @@ -2899,7 +2899,7 @@ - + QByteArray ba; ba.resize(%2); @@ -2923,7 +2923,7 @@ - + QByteArray ba; ba.resize(%2); @@ -2969,13 +2969,13 @@ - + - + %CPPSELF.unlock(); @@ -2995,12 +2995,12 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3091,8 +3091,8 @@ - - + + @@ -3131,7 +3131,7 @@ timer->start(%1); - + // %FUNCTION_NAME() - disable generation of c++ function call Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); @@ -3142,7 +3142,7 @@ if (PyObject_TypeCheck(%2, &PySideSignalInstanceType)) { PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%2); - Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance))); + Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s",PySide::Signal::getSignature(signalInstance))); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, const_cast<char*>("connect"), @@ -3183,7 +3183,7 @@ - + @@ -3201,7 +3201,7 @@ - + long result; @@ -3257,11 +3257,11 @@ - + - - + + QCoreApplication *app = QCoreApplication::instance(); @@ -3285,14 +3285,14 @@ - + - + - + @@ -3334,7 +3334,7 @@ - + .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey")) @@ -3345,7 +3345,7 @@ - + @@ -3620,7 +3620,7 @@ - + @@ -3677,7 +3677,7 @@ - + @@ -3700,7 +3700,7 @@ - + @@ -3714,7 +3714,7 @@ - + @@ -3745,19 +3745,19 @@ - + - + - + @@ -3772,7 +3772,7 @@ - + @@ -3783,7 +3783,7 @@ - + @@ -3809,7 +3809,7 @@ - + @@ -3843,13 +3843,13 @@ - + - + @@ -3870,7 +3870,7 @@ - + @@ -3961,7 +3961,7 @@ - + @@ -4010,7 +4010,7 @@ s1.addTransition(button.clicked, s1h)</code> - + @@ -4020,9 +4020,9 @@ s1.addTransition(button.clicked, s1h)</code> Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); QObject* sender = %CONVERTTOCPP[QObject*](dataSource); if (sender) { - const char *dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1); + const char*dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1); QByteArray signature(dataSignature); // Append SIGNAL flag (2) - %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2); + %0 = new QSignalTransitionWrapper(sender,"2" + signature,%2); } } @@ -4038,7 +4038,7 @@ s1.addTransition(button.clicked, s1h)</code> - + @@ -4062,7 +4062,7 @@ s1.addTransition(button.clicked, s1h)</code> - + @@ -4075,7 +4075,7 @@ s1.addTransition(button.clicked, s1h)</code> goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError; PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%1); QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance)); - QSignalTransition *%0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2); + QSignalTransition*%0 = %CPPSELF->%FUNCTION_NAME(sender,PySide::Signal::getSignature(signalInstance),%2); %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0); @@ -4094,12 +4094,12 @@ s1.addTransition(button.clicked, s1h)</code> - + - + @@ -4117,7 +4117,7 @@ s1.addTransition(button.clicked, s1h)</code> - + %PYARG_0 = PyList_New(0); @@ -4144,13 +4144,13 @@ s1.addTransition(button.clicked, s1h)</code> - %PYARG_0 = Shiboken::String::fromFormat("2%s", QMetaObject::normalizedSignature(%1).constData()); + %PYARG_0 = Shiboken::String::fromFormat("2%s",QMetaObject::normalizedSignature(%1).constData()); - %PYARG_0 = Shiboken::String::fromFormat("1%s", QMetaObject::normalizedSignature(%1).constData()); + %PYARG_0 = Shiboken::String::fromFormat("1%s",QMetaObject::normalizedSignature(%1).constData()); @@ -4164,12 +4164,12 @@ s1.addTransition(button.clicked, s1h)</code> - + - + @@ -4193,7 +4193,7 @@ s1.addTransition(button.clicked, s1h)</code> const unsigned char *, const unsigned char *); - + %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), @@ -4201,7 +4201,7 @@ s1.addTransition(button.clicked, s1h)</code> %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - + %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), @@ -4222,7 +4222,7 @@ s1.addTransition(button.clicked, s1h)</code> - + @@ -4250,8 +4250,8 @@ s1.addTransition(button.clicked, s1h)</code> - - + + diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 0c43fde1f..976380cda 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -275,7 +275,7 @@ - + QTransform _result; if (QTransform::quadToQuad(%1, %2, _result)) { @@ -407,7 +407,7 @@ - + if (_i < 0 || _i >= %CPPSELF.count()) { @@ -423,12 +423,12 @@ - - - - + + + + - + @@ -462,7 +462,7 @@ - + @@ -500,7 +500,7 @@ } - + @@ -555,7 +555,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -646,7 +646,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -794,7 +794,7 @@ - + @@ -823,7 +823,7 @@ uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); %0 = new %TYPE(ptr, %ARGS); - + @@ -833,7 +833,7 @@ - + @@ -860,8 +860,8 @@ - - + + @@ -1575,44 +1575,44 @@ - + - + - + - + - + - + - + - + // Clear parent from the old child QStandardItem *_i = %CPPSELF->child(%1, %2); @@ -1625,7 +1625,7 @@ - + // Clear parent from the old child QStandardItem *_i = %CPPSELF->child(%1); @@ -1639,13 +1639,13 @@ - + - + @@ -1666,7 +1666,7 @@ - + @@ -1737,7 +1737,7 @@ - + @@ -1759,7 +1759,7 @@ - + @@ -1911,12 +1911,12 @@ - + - + @@ -1928,7 +1928,7 @@ - + @@ -1951,32 +1951,32 @@ - + - + - + - + - + - + @@ -1993,18 +1993,18 @@ - + - + - + // Clear parent from the old child QStandardItem *_i = %CPPSELF->item(%1, %2); @@ -2017,7 +2017,7 @@ - + // Clear parent from the old child QStandardItem *_i = %CPPSELF->item(%1); @@ -2036,7 +2036,7 @@ - + // Clear parent from the old child QStandardItem *_i = %CPPSELF->verticalHeaderItem(%1); @@ -2062,19 +2062,19 @@ - + - + - + @@ -2110,7 +2110,7 @@ - + @@ -2219,7 +2219,7 @@ - + - + - + - - - - - - + + + + + + - + - + - - + + %BEGIN_ALLOW_THREADS %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); %END_ALLOW_THREADS - - + + %BEGIN_ALLOW_THREADS %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); %END_ALLOW_THREADS - + - + - + @@ -2295,7 +2295,7 @@ - + @@ -2310,7 +2310,7 @@ - + @@ -3004,7 +3004,7 @@ - + @@ -3035,11 +3035,11 @@ - - + + - - + + if (PySequence_Check(_key)) { @@ -3082,9 +3082,9 @@ - - - + + + @@ -3202,7 +3202,7 @@ This seems to be a related problem with unnamed structures in shiboken. --> - + @@ -3315,7 +3315,7 @@ - + @@ -3633,13 +3633,13 @@ - + - + diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml index 6bd5dd364..bcaa5fee3 100644 --- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml +++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml @@ -44,7 +44,7 @@ - + diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 8058954a1..ea34e0b02 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -59,9 +59,9 @@ - + - + @@ -232,7 +232,7 @@ - + @@ -153,18 +153,18 @@ - + - - - - - + + + + + @@ -301,7 +301,7 @@ - + diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml index 38cec3188..9b7adb71a 100644 --- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml @@ -99,7 +99,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -395,7 +395,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -443,7 +443,7 @@ - + @@ -459,7 +459,7 @@ - + @@ -475,7 +475,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -587,7 +587,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -619,7 +619,7 @@ - + @@ -635,7 +635,7 @@ - + @@ -651,7 +651,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -693,8 +693,8 @@ - - + + @@ -703,7 +703,7 @@ - + @@ -730,7 +730,7 @@ } - + @@ -749,7 +749,7 @@ delete[] data; - + diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml index 24f0de1d8..daf0ed763 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml +++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml @@ -50,7 +50,7 @@ - + diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index 54431a3af..385383fcc 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -54,7 +54,7 @@ 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. Returns the QML type id. @@ -123,7 +123,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -192,7 +192,7 @@ - + diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 5183ec798..d9373e86d 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -70,7 +70,7 @@ - + diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml index 2699f29d4..2e7222a16 100644 --- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml +++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml @@ -71,7 +71,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -135,9 +135,9 @@ - + - + diff --git a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml index 059abb891..7d11970e7 100644 --- a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml +++ b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index c976704b8..ae5e08949 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -79,7 +79,7 @@ - + @@ -88,8 +88,8 @@ 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*,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: 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 @@ -114,32 +114,32 @@ - + - + - + - + - + - + @@ -150,12 +150,12 @@ - + - + diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml index f6dd0333b..f18b8e818 100644 --- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml +++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml @@ -92,32 +92,32 @@ %CPPSELF.addPluginPath(""); // force reload widgets - + - + - + - + - + @@ -132,7 +132,7 @@ - + diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml index 0f8d8da4e..3f51bedbf 100644 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml @@ -53,7 +53,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -162,7 +162,7 @@ - + - + @@ -291,7 +291,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -435,12 +435,12 @@ - + - + @@ -450,21 +450,21 @@ - + - + - + @@ -672,12 +672,12 @@ - + - + @@ -685,7 +685,7 @@ Shiboken::Object::releaseOwnership(%PYARG_2); - + @@ -761,7 +761,7 @@ - + @@ -772,7 +772,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -835,8 +835,8 @@ - - + + @@ -855,7 +855,7 @@ - + @@ -873,7 +873,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -942,7 +942,7 @@ - + %PYARG_0 = addActionWithPyObject(%CPPSELF, %1, %2); @@ -1006,7 +1006,7 @@ - + @@ -1022,22 +1022,22 @@ - + - + - + - + @@ -1078,22 +1078,22 @@ - + - + - + - + @@ -1110,12 +1110,12 @@ - + - + @@ -1150,12 +1150,12 @@ - + - + @@ -1167,22 +1167,22 @@ - + - + - + - + @@ -1210,14 +1210,14 @@ - + - + - + @@ -1287,7 +1287,7 @@ - + @@ -1305,9 +1305,9 @@ - + - + @@ -1356,12 +1356,12 @@ - + addLayoutOwnership(%CPPSELF, %1); - + addLayoutOwnership(%CPPSELF, %1); @@ -1428,29 +1428,29 @@ - + addLayoutOwnership(%CPPSELF, %1); - + addLayoutOwnership(%CPPSELF, %1); - + addLayoutOwnership(%CPPSELF, %2); - + addLayoutOwnership(%CPPSELF, %2); - + addLayoutOwnership(%CPPSELF, %2); @@ -1469,7 +1469,7 @@ - + @@ -1477,7 +1477,7 @@ addLayoutOwnership(%CPPSELF, %0); - + @@ -1485,7 +1485,7 @@ addLayoutOwnership(%CPPSELF, %1); - + @@ -1493,7 +1493,7 @@ addLayoutOwnership(%CPPSELF, %1); - + @@ -1501,7 +1501,7 @@ addLayoutOwnership(%CPPSELF, %1); - + @@ -1509,7 +1509,7 @@ addLayoutOwnership(%CPPSELF, %1); - + @@ -1562,7 +1562,7 @@ - + @@ -1594,7 +1594,7 @@ - + @@ -1647,7 +1647,7 @@ - + @@ -1657,7 +1657,7 @@ - + @@ -1667,7 +1667,7 @@ - + @@ -1677,7 +1677,7 @@ - + @@ -1687,7 +1687,7 @@ - + @@ -1791,29 +1791,29 @@ - + - + - + - + - + @@ -1823,28 +1823,28 @@ - + - + - + - + - + @@ -1860,7 +1860,7 @@ - + @@ -1915,7 +1915,7 @@ - + @@ -1930,12 +1930,12 @@ - + - + @@ -1992,22 +1992,22 @@ - + - + - + - + @@ -2058,37 +2058,37 @@ - + - + - + - + - + - + - + @@ -2098,12 +2098,12 @@ - + - + @@ -2123,7 +2123,7 @@ - + @@ -2134,7 +2134,7 @@ Shiboken::Object::setParent(%PYARG_0, %PYSELF); - + @@ -2148,7 +2148,7 @@ - + @@ -2158,7 +2158,7 @@ - + @@ -2189,7 +2189,7 @@ - + @@ -2206,7 +2206,7 @@ - + @@ -2416,20 +2416,20 @@ - + - + qwidgetSetLayout(%CPPSELF, %1); // %FUNCTION_NAME() - disable generation of function call. - + @@ -2455,26 +2455,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -2487,7 +2487,7 @@ - + @@ -2503,27 +2503,27 @@ - + - + - + - + - + @@ -2587,13 +2587,13 @@ - + - + @@ -2621,9 +2621,9 @@ - - - + + + @@ -2635,7 +2635,7 @@ - + @@ -2648,7 +2648,7 @@ - + @@ -2661,7 +2661,7 @@ - + @@ -2674,7 +2674,7 @@ - + @@ -2687,7 +2687,7 @@ - + @@ -2715,7 +2715,7 @@ - + @@ -2756,7 +2756,7 @@ - + @@ -2766,12 +2766,12 @@ - + - + @@ -2791,12 +2791,12 @@ - + - + @@ -2834,12 +2834,12 @@ - + - + @@ -2885,7 +2885,7 @@ - + @@ -2981,19 +2981,19 @@ - + - + - + @@ -3038,7 +3038,7 @@ - + @@ -3114,23 +3114,23 @@ - + - + - + - + @@ -3156,7 +3156,7 @@ - + @@ -3459,7 +3459,7 @@ - + diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml index a2d665b0a..2dc29f815 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml @@ -49,7 +49,7 @@ - --> + --> diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml index d78a1d77c..d5b2ec974 100644 --- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml +++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml @@ -69,7 +69,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -308,7 +308,7 @@ - + diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml index 888595ccc..c597b41d1 100644 --- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -44,7 +44,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -101,7 +101,7 @@ - + -- cgit v1.2.3 From a861c09fd13d4657191c2d447d7f7d3db5d42d5e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Apr 2018 13:53:27 +0200 Subject: Fix QtWebEngineProcess related issues on the supported platforms There were 2 issues: 1) QtWebEngineProcess could not be found on Windows because we have a non-standard directory layout for the Qt files we copy over (there is no bin directory), so we need to adjust the internal qt.conf which is set in pyside.cpp 2) QtWebEngineProcess itself does not use the qt.conf from pyside.cpp, because it is a separate executable, and thus we need to supply a qt.conf specifically for it which is placed in the libexec folder. Task-number: PYSIDE-626 Task-number: PYSIDE-631 Task-number: PYSIDE-642 Change-Id: I75d1b083fb5afe5dc31ba90174f42c7f559c5cd5 Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/CMakeLists.txt | 19 +++++++++++++++++++ sources/pyside2/PySide2/qt.conf.in | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 sources/pyside2/PySide2/qt.conf.in (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 971d0a9ef..651bf2734 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -13,6 +13,25 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../pyside_version.py" "${CMAKE_CURRENT_BINARY_DIR}/_git_pyside_version.py" @ONLY) +# qt.conf needs to be placed next to QtWebEngineProcess so that the executable uses the correct +# Prefix location leading to an existing icu data file. It is needed on Windows, Linux, and macOS +# non-framework build. In framework build, instead of using qt.conf, Bundle querying is used. +if (WIN32 OR (UNIX AND NOT APPLE) OR (APPLE AND NOT QtCore_is_framework)) + + if (WIN32) + # On Windows, the QtWebEngineProcess is directly located in the Prefix, due to not using + # a "Qt" subfolder like on the other platforms. + set(QT_CONF_PREFIX ".") + else() + # On Linux and non-framework macOS, the QtWebEngineProcess is in ./libexec, so prefix is one + # level higher. + set(QT_CONF_PREFIX "..") + endif() + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.in" + "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" @ONLY) +endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/support/__init__.py" COPYONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/signature/__init__.py" diff --git a/sources/pyside2/PySide2/qt.conf.in b/sources/pyside2/PySide2/qt.conf.in new file mode 100644 index 000000000..ff5b0a30e --- /dev/null +++ b/sources/pyside2/PySide2/qt.conf.in @@ -0,0 +1,2 @@ +[Paths] +Prefix = @QT_CONF_PREFIX@ -- cgit v1.2.3 From ea7ca4ac8e4ab8adde8c909c0adef90f4341062a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Apr 2018 18:44:05 +0200 Subject: Add installed package directory to PATH on Windows This makes sure that all shared libraries like plugins and qml plugins are able to find the Qt libraries they depend on. Task-number: PYSIDE-642 Change-Id: I0f54481c089dfdbc69a9098f2768f98b1e7a9a22 Reviewed-by: Friedemann Kleint --- sources/pyside2/PySide2/__init__.py.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index 4ce266b69..f33b05e31 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -20,10 +20,16 @@ def _setupQtDirectories(): # Used by signature module. os.environ["PYSIDE_PACKAGE_DIR"] = pyside_package_dir - # On Windows add the PySide2\openssl folder (if it exists) to the - # PATH so that the SSL DLLs can be found when Qt tries to dynamically - # load them. Tell Qt to load them and then reset the PATH. if sys.platform == 'win32': + # PATH has to contain the package directory, otherwise plugins + # won't be able to find their required Qt libraries (e.g. the + # svg image plugin won't find Qt5Svg.dll). + os.environ['PATH'] = pyside_package_dir + ";" + os.environ['PATH'] + + # On Windows add the PySide2\openssl folder (if it exists) to + # the PATH so that the SSL DLLs can be found when Qt tries to + # dynamically load them. Tell Qt to load them and then reset + # the PATH. openssl_dir = os.path.join(pyside_package_dir, 'openssl') if os.path.exists(openssl_dir): path = os.environ['PATH'] -- cgit v1.2.3 From 516682fc232db273511440d3c7107ab15f08b5ea Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 18 Mar 2018 11:00:27 +0100 Subject: Add QtWebEngineCore module Change-Id: I8e1127e082abe5978a94aa8a080dfb1d8bbd5952 Reviewed-by: Friedemann Kleint --- .../pyside2/PySide2/QtWebEngineCore/CMakeLists.txt | 37 ++++++++++++ .../QtWebEngineCore/typesystem_webenginecore.xml | 69 ++++++++++++++++++++++ .../PySide2/QtWebEngineWidgets/CMakeLists.txt | 1 + .../typesystem_webenginewidgets.xml | 1 + 4 files changed, 108 insertions(+) create mode 100644 sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt create mode 100644 sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt new file mode 100644 index 000000000..109b9f208 --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt @@ -0,0 +1,37 @@ +project(QtWebEngineCore) + +set(QtWebEngineCore_SRC +${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginehttprequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinfo_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinterceptor_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestjob_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlschemehandler_wrapper.cpp +# module is always needed +${QtWebEngineCore_GEN_DIR}/qtwebenginecore_module_wrapper.cpp +) + +set(QtWebEngineCore_include_dirs + ${QtWebEngineCore_SOURCE_DIR} + ${QtWebEngineCore_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ) +set(QtWebEngineCore_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5WebEngineCore_LIBRARIES} + ${Qt5Core_LIBRARIES} + ) +set(QtWebEngineCore_deps QtCore) +create_pyside_module(QtWebEngineCore + QtWebEngineCore_include_dirs + QtWebEngineCore_libraries + QtWebEngineCore_deps + QtWebEngineCore_SOURCE_DIR + QtWebEngineCore_SRC + "") + diff --git a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml new file mode 100644 index 000000000..5fb064ccb --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt index 32d0643c8..f04394de9 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt @@ -33,6 +33,7 @@ set(QtWebEngineWidgets_include_dirs ${QtWebEngineWidgets_GEN_DIR} ${QtNetwork_GEN_DIR} ${QtWebChannel_GEN_DIR} + ${QtWebEngineCore_GEN_DIR} ) set(QtWebEngineWidgets_libraries pyside2 ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml index 9462c3e41..43324e557 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml @@ -45,6 +45,7 @@ + -- cgit v1.2.3 From 186b40b958aa1ebe7317ccf5de7109a327b5c65d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Apr 2018 08:39:24 +0200 Subject: Add QtSensors Task-number: PYSIDE-487 Change-Id: Id60f3f6e70b4fbb8e4316b994cdd557ff9be7b3b Reviewed-by: Alexandru Croitor --- sources/pyside2/PySide2/QtSensors/CMakeLists.txt | 106 +++++++++++++++++ .../PySide2/QtSensors/typesystem_sensors.xml | 127 +++++++++++++++++++++ 2 files changed, 233 insertions(+) create mode 100644 sources/pyside2/PySide2/QtSensors/CMakeLists.txt create mode 100644 sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt new file mode 100644 index 000000000..226625443 --- /dev/null +++ b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt @@ -0,0 +1,106 @@ +project(QtSensors) + +set(QtSensors_OPTIONAL_SRC ) +set(QtSensors_DROPPED_ENTRIES ) + +set(QtSensors_SRC +# overrides QObject::metaObject() by private method +# ${QtSensors_GEN_DIR}/qsensorgesture_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgesturemanager_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgestureplugininterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgesturerecognizer_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometer_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometerfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometerreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeterfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeterreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturesensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompass_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompassfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompassreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancesensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscope_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscopefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscopereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qholsterfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qholsterreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qholstersensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumidityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumidityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumiditysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximitysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometer_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometerfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometerreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressurefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressurereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressuresensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximitysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qoutputrange_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorbackend_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorbackendfactory_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensormanager_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorchangesinterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorplugininterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltsensor_wrapper.cpp +# module is always needed + ${QtSensors_GEN_DIR}/qtsensors_module_wrapper.cpp +) + +set(QtSensors_include_dirs ${QtSensors_SOURCE_DIR} + ${QtSensors_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Sensors_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtSensors_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Sensors_LIBRARIES}) + +set(QtSensors_deps QtCore) + +create_pyside_module(QtSensors + QtSensors_include_dirs + QtSensors_libraries + QtSensors_deps + QtSensors_SOURCE_DIR + QtSensors_SRC + "" + "" + QtSensors_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml b/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml new file mode 100644 index 000000000..45d64e0a2 --- /dev/null +++ b/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 77a433f80ea32f19507f0992b96aacf481a43304 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Apr 2018 15:42:20 +0200 Subject: QWebEngineDownloadItem: Add enum SavePageFormat Task-number: PYSIDE-487 Change-Id: Ia4b57f4cdc48741ed7659018a742bbda3824c188 Reviewed-by: Alexandru Croitor --- .../pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'sources/pyside2/PySide2') diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml index 43324e557..41c8afcfe 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml @@ -54,6 +54,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt new file mode 100644 index 000000000..3a2eb9cf5 --- /dev/null +++ b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt @@ -0,0 +1,55 @@ +project(QtPositioning) + +set(QtPositioning_OPTIONAL_SRC ) +set(QtPositioning_DROPPED_ENTRIES ) + +set(QtPositioning_SRC +${QtPositioning_GEN_DIR}/qgeoaddress_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoareamonitorinfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoareamonitorsource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeolocation_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeocircle_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeocoordinate_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopath_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfosourcefactory_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeorectangle_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeosatelliteinfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeosatelliteinfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoshape_wrapper.cpp +${QtPositioning_GEN_DIR}/qnmeapositioninfosource_wrapper.cpp +# module is always needed +${QtPositioning_GEN_DIR}/qtpositioning_module_wrapper.cpp +) + +if (Qt5Positioning_VERSION VERSION_EQUAL 5.10.0 OR Qt5Positioning_VERSION VERSION_GREATER 5.10.0) + list(APPEND QtPositioning_SRC + ${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp) +endif() + +set(QtPositioning_include_dirs ${QtPositioning_SOURCE_DIR} + ${QtPositioning_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Positioning_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtPositioning_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Positioning_LIBRARIES}) + +set(QtPositioning_deps QtCore) + +create_pyside_module(QtPositioning + QtPositioning_include_dirs + QtPositioning_libraries + QtPositioning_deps + QtPositioning_SOURCE_DIR + QtPositioning_SRC + "" + "" + QtPositioning_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml b/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml new file mode 100644 index 000000000..058994ad0 --- /dev/null +++ b/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3