diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-18 16:15:39 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-18 16:15:42 +0200 |
| commit | 3f45ae1bb3ad3ed433780731e87b0bf66558116d (patch) | |
| tree | 9df72769796e5c4a1f64c1ef52ad2c00e7094a77 | |
| parent | b9e8c5faadf09060191c1b607f64e59cb8baf97e (diff) | |
| parent | 31c5a40d30eda3ea242b16e41a928db8b411bee2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ida4053330f436fa707689707d8a35734a836cd57
| -rw-r--r-- | PySide2/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | PySide2/QtMacExtras/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide2/QtMacExtras/typesystem_macextras.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 8ab13447..13f24838 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -937,7 +937,7 @@ <enum-type name="ToolBarArea" flags="ToolBarAreas" /> <enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolButtonStyle"/> - <enum-type name="TouchPointState" since="4.6"/> + <enum-type name="TouchPointState" flags="TouchPointStates" since="4.6"/> <enum-type name="TransformationMode"/> <enum-type name="UIEffect"/> <enum-type name="WhiteSpaceMode" /> diff --git a/PySide2/QtMacExtras/CMakeLists.txt b/PySide2/QtMacExtras/CMakeLists.txt index 9bb8dd00..a98f18e6 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 f52597cd..55c7d016 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"/> |