diff options
author | Kent Hansen <khansen@trolltech.com> | 2009-06-04 13:56:38 +0200 |
---|---|---|
committer | Kent Hansen <khansen@trolltech.com> | 2009-06-04 13:56:38 +0200 |
commit | 57dc43f74ce316053886723bb9060fda4baeca47 (patch) | |
tree | d4c27bbc7581780c88175535d26f6cadc526927d | |
parent | b48b3a8b67e48076baf8d835b46e7b27855fee5c (diff) | |
parent | 62fa1b98987ead4cfd591de4bb0aa16824d489ae (diff) |
Merge branch 'master' into 4.6
-rw-r--r-- | generator/typesystem_gui-qtscript.xml | 1 | ||||
-rw-r--r-- | generator/typesystem_gui.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/generator/typesystem_gui-qtscript.xml b/generator/typesystem_gui-qtscript.xml index cedec2b..076d617 100644 --- a/generator/typesystem_gui-qtscript.xml +++ b/generator/typesystem_gui-qtscript.xml @@ -26,7 +26,6 @@ <rejection class="QSortFilterProxyModel"/> <rejection class="QDirModel"/> <rejection class="QFileSystemModel"/> - <rejection class="QGraphicsSceneDragDropEvent"/> <rejection class="QPrinterInfo"/> <rejection class="QProxyModel"/> <rejection class="QPrinterInfo"/> <!-- ### constructor takes QPrinter&, must become QPrinter* --> diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml index 33bdd28..2276ade 100644 --- a/generator/typesystem_gui.xml +++ b/generator/typesystem_gui.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QFontDatabase"/><rejection class="QIconEngineV2"/><rejection class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection class="QTextBlock::iterator"/><rejection class="QTextEdit::ExtraSelection"/><rejection class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection class="QTreeWidgetItemIterator"/><rejection class="QAccessibleFactoryInterface"/><rejection class="QIconEngineFactoryInterfaceV2"/><rejection class="QImageIOHandlerFactoryInterface"/><rejection class="QInputContextFactoryInterface"/><rejection class="QStyleFactoryInterface"/><rejection class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QFileSystemModel"/><rejection class="QGraphicsSceneDragDropEvent"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super classes"/> +<typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QFontDatabase"/><rejection class="QIconEngineV2"/><rejection class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection class="QTextBlock::iterator"/><rejection class="QTextEdit::ExtraSelection"/><rejection class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection class="QTreeWidgetItemIterator"/><rejection class="QAccessibleFactoryInterface"/><rejection class="QIconEngineFactoryInterfaceV2"/><rejection class="QImageIOHandlerFactoryInterface"/><rejection class="QInputContextFactoryInterface"/><rejection class="QStyleFactoryInterface"/><rejection class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QFileSystemModel"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super classes"/> <rejection class="*" function-name="d_func"/> <rejection class="*" field-name="d_ptr"/> |