diff options
| author | Renato Araujo Oliveira Filho <renato.filho@openbossa.org> | 2011-02-08 11:57:59 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:53:55 -0300 |
| commit | 811e37c378ee12dca738e57c640385c9e0546355 (patch) | |
| tree | 2998eb37b505aaaa8de74031c52aa859595644f2 /PySide/QtGui/CMakeLists.txt | |
| parent | 9386dd0452eb72c0940f14756254c4e14ac76415 (diff) | |
Separated class typesystem from the main typesystem.
Remove class specification, detected during the compilation from the
main typesystem to avoid errors during the generation.
Fixes bug #661
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Hugo Parente Lima <hugo.pl@gmail.com>
Diffstat (limited to 'PySide/QtGui/CMakeLists.txt')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 7178e60ba..4313606ec 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -381,24 +381,24 @@ ${SPECIFIC_OS_FILES} ${QtGui_46_SRC} ) - +set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in" - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) + "${TARGET_TYPESYSTEM}" @ONLY) -check_qt_class(QtGui QGtkStyle QtGui_SRC) -check_qt_class(QtGui QSessionManager QtGui_SRC) -check_qt_class(QtGui QSizeGrip QtGui_SRC) -check_qt_class(QtGui QSystemTrayIcon QtGui_SRC) +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) -check_qt_class(QtGui QAbstractPrintDialog QtGui_SRC) -check_qt_class(QtGui QPageSetupDialog QtGui_SRC) -check_qt_class(QtGui QPrintDialog QtGui_SRC) -check_qt_class(QtGui QPrintPreviewWidget QtGui_SRC) -check_qt_class(QtGui QPrintPreviewDialog QtGui_SRC) -check_qt_class(QtGui QPrinter QtGui_SRC) -check_qt_class(QtGui QPrinterInfo QtGui_SRC) -check_qt_class(QtGui QPrintEngine QtGui_SRC) +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}) set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}") set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} @@ -421,7 +421,7 @@ create_pyside_module(QtGui QtGui_deps QtGui_typesystem_path QtGui_SRC - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" + ${TARGET_TYPESYSTEM} QPYTEXTOBJECT_MOC) |