diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-02-16 11:37:45 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:53:59 -0300 |
commit | 75937124c2e8b567e226d7675265a87562d4a1c7 (patch) | |
tree | c4065652837f26c4e1b63fbc0f01cd91b3b08832 /PySide/QtGui | |
parent | 861e26665da05bc6fbc28ed3503fdcc4b8bd9fb6 (diff) |
Updated CMake files to use the "--drop-type-entries" generator option.
Instead of maintaining a complex CMake scheme to remove optional type
system entries, the generation will rely on the new generator capability
of dropping entries given via command line.
Reviewed by Bruno Araújo <bruno.araujo@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
-rw-r--r-- | PySide/QtGui/CMakeLists.txt | 42 | ||||
-rw-r--r-- | PySide/QtGui/optional/QAbstractPageSetupDialog.xml | 1 | ||||
-rw-r--r-- | PySide/QtGui/optional/QAbstractPrintDialog.xml | 6 | ||||
-rw-r--r-- | PySide/QtGui/optional/QGtkStyle.xml | 11 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPageSetupDialog.xml | 5 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrintDialog.xml | 3 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrintEngine.xml | 3 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrintPreviewDialog.xml | 1 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrintPreviewWidget.xml | 6 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrinter.xml | 30 | ||||
-rw-r--r-- | PySide/QtGui/optional/QPrinterInfo.xml | 1 | ||||
-rw-r--r-- | PySide/QtGui/optional/QSessionManager.xml | 7 | ||||
-rw-r--r-- | PySide/QtGui/optional/QSizeGrip.xml | 2 | ||||
-rw-r--r-- | PySide/QtGui/optional/QSystemTrayIcon.xml | 10 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 90 |
15 files changed, 111 insertions, 107 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 4313606ec..c25a95e6c 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -5,7 +5,7 @@ if(ENABLE_X11) ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11info_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedcontainer_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedwidget_wrapper.cpp - ) + ) if(Q_WS_MAEMO_5) set(SPECIFIC_OS_FILES @@ -60,6 +60,22 @@ else() ) endif () +set(QtGui_OPTIONAL_SRC ) +set(QtGui_DROPPED_ENTRIES ) +check_qt_class(QtGui QAbstractPageSetupDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QAbstractPrintDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QGtkStyle QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPageSetupDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrintDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrintEngine QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrintPreviewDialog QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrintPreviewWidget QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrinter QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +check_qt_class(QtGui QPrinterInfo QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES) +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) + qt4_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside_SOURCE_DIR}/qpytextobject.h") set(QtGui_SRC @@ -378,27 +394,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwizard_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp ${SPECIFIC_OS_FILES} +${QPYTEXTOBJECT_MOC} ${QtGui_46_SRC} +${QtGui_OPTIONAL_SRC} ) -set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in" - "${TARGET_TYPESYSTEM}" @ONLY) - -check_qt_class(QtGui QGtkStyle QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QSessionManager QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QSizeGrip QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QSystemTrayIcon QtGui_SRC ${TARGET_TYPESYSTEM}) - -check_qt_class(QtGui QAbstractPageSetupDialog QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QAbstractPrintDialog QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPageSetupDialog QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrintDialog QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrintPreviewWidget QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrintPreviewDialog QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrinter QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrinterInfo QtGui_SRC ${TARGET_TYPESYSTEM}) -check_qt_class(QtGui QPrintEngine QtGui_SRC ${TARGET_TYPESYSTEM}) + "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}") set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} @@ -421,8 +423,6 @@ create_pyside_module(QtGui QtGui_deps QtGui_typesystem_path QtGui_SRC - ${TARGET_TYPESYSTEM} - QPYTEXTOBJECT_MOC) - + ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml) install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/) diff --git a/PySide/QtGui/optional/QAbstractPageSetupDialog.xml b/PySide/QtGui/optional/QAbstractPageSetupDialog.xml deleted file mode 100644 index 902fb6eb1..000000000 --- a/PySide/QtGui/optional/QAbstractPageSetupDialog.xml +++ /dev/null @@ -1 +0,0 @@ -<object-type name="QAbstractPageSetupDialog"/> diff --git a/PySide/QtGui/optional/QAbstractPrintDialog.xml b/PySide/QtGui/optional/QAbstractPrintDialog.xml deleted file mode 100644 index 373cf3058..000000000 --- a/PySide/QtGui/optional/QAbstractPrintDialog.xml +++ /dev/null @@ -1,6 +0,0 @@ -<object-type name="QAbstractPrintDialog"> - <enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/> - <enum-type name="PrintRange"/> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> -</object-type> - diff --git a/PySide/QtGui/optional/QGtkStyle.xml b/PySide/QtGui/optional/QGtkStyle.xml deleted file mode 100644 index e75e06c91..000000000 --- a/PySide/QtGui/optional/QGtkStyle.xml +++ /dev/null @@ -1,11 +0,0 @@ -<object-type name="QGtkStyle"> - <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const"> - <modify-argument index="2"> - <replace-default-expression with="0"/> - </modify-argument> - <modify-argument index="3"> - <replace-default-expression with="0"/> - </modify-argument> - </modify-function> -</object-type> - diff --git a/PySide/QtGui/optional/QPageSetupDialog.xml b/PySide/QtGui/optional/QPageSetupDialog.xml deleted file mode 100644 index 66fe0645b..000000000 --- a/PySide/QtGui/optional/QPageSetupDialog.xml +++ /dev/null @@ -1,5 +0,0 @@ -<object-type name="QPageSetupDialog"> - <enum-type name="PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/> - <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> -</object-type> - diff --git a/PySide/QtGui/optional/QPrintDialog.xml b/PySide/QtGui/optional/QPrintDialog.xml deleted file mode 100644 index 7b62f484a..000000000 --- a/PySide/QtGui/optional/QPrintDialog.xml +++ /dev/null @@ -1,3 +0,0 @@ -<object-type name="QPrintDialog"> - <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> -</object-type> diff --git a/PySide/QtGui/optional/QPrintEngine.xml b/PySide/QtGui/optional/QPrintEngine.xml deleted file mode 100644 index 0f792fc5a..000000000 --- a/PySide/QtGui/optional/QPrintEngine.xml +++ /dev/null @@ -1,3 +0,0 @@ -<object-type name="QPrintEngine"> - <enum-type name="PrintEnginePropertyKey" /> -</object-type> diff --git a/PySide/QtGui/optional/QPrintPreviewDialog.xml b/PySide/QtGui/optional/QPrintPreviewDialog.xml deleted file mode 100644 index 635f3906d..000000000 --- a/PySide/QtGui/optional/QPrintPreviewDialog.xml +++ /dev/null @@ -1 +0,0 @@ -<object-type name="QPrintPreviewDialog"/> diff --git a/PySide/QtGui/optional/QPrintPreviewWidget.xml b/PySide/QtGui/optional/QPrintPreviewWidget.xml deleted file mode 100644 index cf60a03a7..000000000 --- a/PySide/QtGui/optional/QPrintPreviewWidget.xml +++ /dev/null @@ -1,6 +0,0 @@ -<object-type name="QPrintPreviewWidget"> - <enum-type name="ViewMode"/> - <enum-type name="ZoomMode"/> - <modify-function signature="print()" rename="print_" /> -</object-type> - diff --git a/PySide/QtGui/optional/QPrinter.xml b/PySide/QtGui/optional/QPrinter.xml deleted file mode 100644 index b57416c41..000000000 --- a/PySide/QtGui/optional/QPrinter.xml +++ /dev/null @@ -1,30 +0,0 @@ -<rejection class="QPrinter" function-name="printerSelectionOption"/> -<rejection class="QPrinter" function-name="setPrinterSelectionOption"/> - -<object-type name="QPrinter" > - <enum-type name="ColorMode"/> - <enum-type name="DuplexMode"/> - <enum-type name="Orientation"/> - <enum-type name="OutputFormat"/> - <enum-type name="PageOrder"/> - <enum-type name="PageSize" /> - <enum-type name="PaperSource"/> - <enum-type name="PrintRange"/> - <enum-type name="PrinterMode"/> - <enum-type name="PrinterState"/> - <enum-type name="Unit"/> - <!-- TODO: What to do with this function? --> - <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const" remove="all" /> - <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <extra-includes> - <include file-name="QPrinterInfo" location="global"/> - </extra-includes> -</object-type> - diff --git a/PySide/QtGui/optional/QPrinterInfo.xml b/PySide/QtGui/optional/QPrinterInfo.xml deleted file mode 100644 index 479c4b454..000000000 --- a/PySide/QtGui/optional/QPrinterInfo.xml +++ /dev/null @@ -1 +0,0 @@ -<value-type name="QPrinterInfo" /> diff --git a/PySide/QtGui/optional/QSessionManager.xml b/PySide/QtGui/optional/QSessionManager.xml deleted file mode 100644 index b8be5e81b..000000000 --- a/PySide/QtGui/optional/QSessionManager.xml +++ /dev/null @@ -1,7 +0,0 @@ -<object-type name="QSessionManager"> - <extra-includes> - </extra-includes> - <enum-type name="RestartHint"/> - <modify-function signature="handle()const" remove="all"/> -</object-type> - diff --git a/PySide/QtGui/optional/QSizeGrip.xml b/PySide/QtGui/optional/QSizeGrip.xml deleted file mode 100644 index a0792daa1..000000000 --- a/PySide/QtGui/optional/QSizeGrip.xml +++ /dev/null @@ -1,2 +0,0 @@ -<object-type name="QSizeGrip"/> - diff --git a/PySide/QtGui/optional/QSystemTrayIcon.xml b/PySide/QtGui/optional/QSystemTrayIcon.xml deleted file mode 100644 index 438759057..000000000 --- a/PySide/QtGui/optional/QSystemTrayIcon.xml +++ /dev/null @@ -1,10 +0,0 @@ -<object-type name="QSystemTrayIcon"> - <enum-type name="ActivationReason"/> - <enum-type name="MessageIcon"/> - <modify-function signature="setContextMenu(QMenu*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> -</object-type> - diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 724ac1eca..e1a6f40fc 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -6002,4 +6002,94 @@ <suppress-warning text="class not found for setup inheritance 'QMimeSource'"/> <suppress-warning text="class 'QDropEvent' inherits from unknown base class 'QMimeSource'"/> + + <!-- The following entries may be present in the system or not. Keep this section organized. --> + <object-type name="QAbstractPageSetupDialog"/> + <object-type name="QAbstractPrintDialog"> + <enum-type name="PrintDialogOption" flags="QAbstractPrintDialog::PrintDialogOptions"/> + <enum-type name="PrintRange"/> + <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> + </object-type> + + <object-type name="QGtkStyle"> + <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const"> + <modify-argument index="2"> + <replace-default-expression with="0"/> + </modify-argument> + <modify-argument index="3"> + <replace-default-expression with="0"/> + </modify-argument> + </modify-function> + </object-type> + + <object-type name="QPageSetupDialog"> + <enum-type name="PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/> + <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> + </object-type> + + <object-type name="QPrintDialog"> + <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> + </object-type> + <object-type name="QPrintEngine"> + <enum-type name="PrintEnginePropertyKey" /> + </object-type> + <value-type name="QPrinterInfo" /> + <rejection class="QPrinter" function-name="printerSelectionOption"/> + <rejection class="QPrinter" function-name="setPrinterSelectionOption"/> + + <object-type name="QPrinter" > + <enum-type name="ColorMode"/> + <enum-type name="DuplexMode"/> + <enum-type name="Orientation"/> + <enum-type name="OutputFormat"/> + <enum-type name="PageOrder"/> + <enum-type name="PageSize" /> + <enum-type name="PaperSource"/> + <enum-type name="PrintRange"/> + <enum-type name="PrinterMode"/> + <enum-type name="PrinterState"/> + <enum-type name="Unit"/> + <!-- TODO: What to do with this function? --> + <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const" remove="all" /> + <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <extra-includes> + <include file-name="QPrinterInfo" location="global"/> + </extra-includes> + </object-type> + + <object-type name="QPrintPreviewDialog"/> + <object-type name="QPrintPreviewWidget"> + <enum-type name="ViewMode"/> + <enum-type name="ZoomMode"/> + <modify-function signature="print()" rename="print_" /> + </object-type> + + <object-type name="QSessionManager"> + <extra-includes> + </extra-includes> + <enum-type name="RestartHint"/> + <modify-function signature="handle()const" remove="all"/> + </object-type> + + <object-type name="QSizeGrip"/> + + <object-type name="QSystemTrayIcon"> + <enum-type name="ActivationReason"/> + <enum-type name="MessageIcon"/> + <modify-function signature="setContextMenu(QMenu*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + </modify-function> + </object-type> + <!-- The above entries may be present in the system or not. Keep this section organized. --> + </typesystem> + |