aboutsummaryrefslogtreecommitdiffstats
path: root/PySide2/QtMacExtras
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-18 16:22:47 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-18 16:22:50 +0200
commitd4112e4a6ea25aee831da3cd123f139b5f7229bf (patch)
tree9df72769796e5c4a1f64c1ef52ad2c00e7094a77 /PySide2/QtMacExtras
parent352a80482b0afdc1df5acf526e4ada2c0d30b806 (diff)
parent3f45ae1bb3ad3ed433780731e87b0bf66558116d (diff)
Merge remote-tracking branch 'origin/5.9' into devHEADdev
Diffstat (limited to 'PySide2/QtMacExtras')
-rw-r--r--PySide2/QtMacExtras/CMakeLists.txt2
-rw-r--r--PySide2/QtMacExtras/typesystem_macextras.xml4
2 files changed, 3 insertions, 3 deletions
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"/>