diff options
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtGui/CMakeLists.txt | 1 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_mac.xml | 4 | ||||
-rw-r--r-- | PySide/global.h.in | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 858747256..d026a9338 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -75,6 +75,7 @@ check_qt_class(QtGui QPrinterInfo QtGui_OPTIONAL_SRC QtGui_DROPPED check_qt_class(QtGui QSessionManager QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) check_qt_class(QtGui QSizeGrip QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) check_qt_class(QtGui QSystemTrayIcon QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QMacStyle QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) qt4_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside_SOURCE_DIR}/qpytextobject.h") diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml index 2f4ac4c41..b7597b98f 100644 --- a/PySide/QtGui/typesystem_gui_mac.xml +++ b/PySide/QtGui/typesystem_gui_mac.xml @@ -23,6 +23,10 @@ <rejection class="*" function-name="macMenu"/> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> + <object-type name="QMacStyle" > + <enum-type name="FocusRectPolicy"/> + <enum-type name="WidgetSizePolicy"/> + </object-type> <suppress-warning text="enum 'QPixmap::ShareMode' does not have a type entry or is not an enum" /> <suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared" /> diff --git a/PySide/global.h.in b/PySide/global.h.in index 977212dac..c1ada8090 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -339,6 +339,8 @@ QT_END_HEADER #include <QtGui/QX11Info> #include <QtGui/QX11EmbedContainer> #include <QtGui/QX11EmbedWidget> +#elif @ENABLE_MAC@ + #include <QtGui/qmacstyle_mac.h> #endif #include <QtXml/QtXml> #include <QtUiTools/QtUiTools> |