diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-20 17:13:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 08:31:58 +0000 |
| commit | ca7e25ab0cc5b0d093a9bc5afff837f6e8ab6a8e (patch) | |
| tree | d539769dce04fee8491dc88937a5d6b056e31436 /PySide2 | |
| parent | bbc13fe6ad1de634a6d3b594220ad780583378e0 (diff) | |
Add QStandardPaths and QDesktopServices to typesystem
Task-number: PYSIDE-432
Change-Id: I26e3f3a081bc95931de775ce9820bc783eed568e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'PySide2')
| -rw-r--r-- | PySide2/QtCore/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | PySide2/QtCore/typesystem_core_common.xml | 4 | ||||
| -rw-r--r-- | PySide2/QtGui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | PySide2/QtGui/typesystem_gui_common.xml | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/PySide2/QtCore/CMakeLists.txt b/PySide2/QtCore/CMakeLists.txt index 4b097e8d..97a6f68e 100644 --- a/PySide2/QtCore/CMakeLists.txt +++ b/PySide2/QtCore/CMakeLists.txt @@ -107,6 +107,7 @@ ${QtCore_GEN_DIR}/qsizef_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}/qstatemachine_signalevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrappedevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrapper.cpp diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 9a2d74b6..eab9d834 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -3606,6 +3606,10 @@ <modify-function signature="readLine(qint64)" allow-thread="yes"/> <modify-function signature="readAll()" allow-thread="yes"/> </object-type> + <object-type name="QStandardPaths" since="5.0"> + <enum-type name="StandardLocation"/> + <enum-type name="LocateOption" flags="LocateOptions"/> + </object-type> <object-type name="QSystemSemaphore"> <enum-type name="AccessMode"/> <enum-type name="SystemSemaphoreError"/> diff --git a/PySide2/QtGui/CMakeLists.txt b/PySide2/QtGui/CMakeLists.txt index 6960b2cd..3fa2effd 100644 --- a/PySide2/QtGui/CMakeLists.txt +++ b/PySide2/QtGui/CMakeLists.txt @@ -16,6 +16,7 @@ ${QtGui_GEN_DIR}/qcolor_wrapper.cpp ${QtGui_GEN_DIR}/qconicalgradient_wrapper.cpp ${QtGui_GEN_DIR}/qcontextmenuevent_wrapper.cpp ${QtGui_GEN_DIR}/qcursor_wrapper.cpp +${QtGui_GEN_DIR}/qdesktopservices_wrapper.cpp ${QtGui_GEN_DIR}/qdoublevalidator_wrapper.cpp ${QtGui_GEN_DIR}/qdrag_wrapper.cpp ${QtGui_GEN_DIR}/qdragenterevent_wrapper.cpp diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml index a6795f12..855610dc 100644 --- a/PySide2/QtGui/typesystem_gui_common.xml +++ b/PySide2/QtGui/typesystem_gui_common.xml @@ -1482,6 +1482,7 @@ </object-type> <object-type name="QPyTextObject" /> + <object-type name="QDesktopServices" since="4.2" /> <object-type name="QDoubleValidator"> <enum-type name="Notation"/> </object-type> |