diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-09 11:06:04 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2017-05-13 12:09:35 +0000 |
commit | 028a3cbf95a7e092c72a1c9c7a963316645baec7 (patch) | |
tree | 4e63f32d7c674782c0cd2d8973a6ea7bd5cba6ab /PySide2 | |
parent | a80a6eb94433529a6d984e8ff22874f7dff48eea (diff) |
Add QMacPasteboardMime and qRegisterDraggedTypes() to typesystem
Task-number: PYSIDE-487
Change-Id: I56b9138e8b368754ee07965479d6c8e795fc8206
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'PySide2')
-rw-r--r-- | PySide2/QtMacExtras/CMakeLists.txt | 2 | ||||
-rw-r--r-- | PySide2/QtMacExtras/typesystem_macextras.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/PySide2/QtMacExtras/CMakeLists.txt b/PySide2/QtMacExtras/CMakeLists.txt index 9bb8dd00d..a98f18e69 100644 --- a/PySide2/QtMacExtras/CMakeLists.txt +++ b/PySide2/QtMacExtras/CMakeLists.txt @@ -1,7 +1,7 @@ project(QtMacExtras) set(QtMacExtras_SRC -#${QtMacExtras_GEN_DIR}/qmacpasteboardmime_wrapper.cpp +${QtMacExtras_GEN_DIR}/qmacpasteboardmime_wrapper.cpp ${QtMacExtras_GEN_DIR}/qmactoolbar_wrapper.cpp ${QtMacExtras_GEN_DIR}/qmactoolbaritem_wrapper.cpp diff --git a/PySide2/QtMacExtras/typesystem_macextras.xml b/PySide2/QtMacExtras/typesystem_macextras.xml index f52597cde..55c7d0160 100644 --- a/PySide2/QtMacExtras/typesystem_macextras.xml +++ b/PySide2/QtMacExtras/typesystem_macextras.xml @@ -43,11 +43,11 @@ <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> - <!-- + <function signature="qRegisterDraggedTypes(QStringList)" since="5.2"/> + <object-type name="QMacPasteboardMime" since="5.2"> <enum-type name="QMacPasteboardMimeType"/> </object-type> - --> <object-type name="QMacToolBar" since="5.3"/> <object-type name="QMacToolBarItem" since="5.3"> <enum-type name="StandardItem"/> |