diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-27 14:20:36 +0200 |
| commit | 25f899e276c00b8d7f334819d6cd7927ed67093a (patch) | |
| tree | d2a063aab76e0435eb862ca5d2b541a5e718f062 /sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | |
| parent | 4725008aeea407ae55cfd66de802dd9e06412efc (diff) | |
| parent | e30e0c161b2b4d50484314bf006e9e5e8ff6b380 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938
Diffstat (limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index dd8404ce0..9260b3d38 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -3238,10 +3238,7 @@ <!-- Qt5: not sure if this needs support, skipped for now --> <rejection class="QWindow" function-name="nativeEvent"/>" - <!-- Qt5: here the new QGuiApplication and related things --> <object-type name="QGuiApplication"> - <!-- Qt5: gone <enum-type name="ColorSpec"/> --> - <!-- Qt5: gone <enum-type name="Type"/> --> <extra-includes> <include file-name="QBasicTimer" location="global"/> <include file-name="QFont" location="global"/> @@ -3251,9 +3248,9 @@ <include file-name="QLocale" location="global"/> </extra-includes> <modify-function signature="QGuiApplication(int&,char**,int)" access="private" /> - <add-function signature="QGuiApplication(PySequence)"> + <add-function signature="QGuiApplication(QStringList)"> <inject-code> - QGuiApplicationConstructor(%PYSELF, %1, &%0); + QGuiApplicationConstructor(%PYSELF, args, &%0); </inject-code> </add-function> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> |