diff options
author | Renato Filho <renato.filho@openbossa.org> | 2010-08-26 18:12:45 -0300 |
---|---|---|
committer | Renato Filho <renato.filho@openbossa.org> | 2010-08-26 18:23:35 -0300 |
commit | 2774fd8af75ad5a1f412d6e72493de438ce2b8ae (patch) | |
tree | eca78f677cf6f90f5c9d802c691f73d412351d42 /PySide | |
parent | d552e6eba8a908b02dc032402f532245f672dad0 (diff) | |
download | pyside-2774fd8af75ad5a1f412d6e72493de438ce2b8ae.tar.gz pyside-2774fd8af75ad5a1f412d6e72493de438ce2b8ae.tar.xz pyside-2774fd8af75ad5a1f412d6e72493de438ce2b8ae.zip |
Fixed Mac OS build
Fix parser of QApplication header.
Fixes bug #318
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Hugo Parente Lima <hugo.pl@gmail.com>
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtGui/typesystem_gui.xml | 2 | ||||
-rw-r--r-- | PySide/global.h.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/PySide/QtGui/typesystem_gui.xml b/PySide/QtGui/typesystem_gui.xml index a5dcfd9..66c33d4 100644 --- a/PySide/QtGui/typesystem_gui.xml +++ b/PySide/QtGui/typesystem_gui.xml @@ -4361,6 +4361,8 @@ <include file-name="QStyle" location="global"/> </extra-includes> <modify-function signature="QApplication(int &, char **)" access="private" /> + <modify-function signature="QApplication(int &, char **, bool)" remove="all" /> + <modify-function signature="QApplication(int &, char **, QApplication::Type)" remove="all" /> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <inject-code class="native" file="glue/qapplication_init.cpp" position="beginning" /> diff --git a/PySide/global.h.in b/PySide/global.h.in index ef85424..402de4e 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -348,6 +348,8 @@ QT_END_HEADER #include <QtCore/QtCore> #if @ENABLE_MAC@ || @ENABLE_WIN@ + // Workaround to parse the QApplication header + #define Q_INTERNAL_QAPP_SRC #undef qdoc #endif #include <QtGui/QtGui> |