jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the right typesystem file for QtGui.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Reviewer: Bruno Araújo <bruno.araujo@openbossa.org>
This commit is contained in:
Hugo Lima 2010-03-23 16:37:34 -03:00
commit 30480cb699
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
PySide/QtNetwork/typesystem_network.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtNetwork"> <typesystem package="PySide.QtNetwork">
<load-typesystem name="typesystem_templates.xml" generate="no" />
<load-typesystem name="typesystem_core.xml" generate="no" /> <load-typesystem name="typesystem_core.xml" generate="no" />
<namespace-type name="QSsl"> <namespace-type name="QSsl">

2
PySide/QtSvg/CMakeLists.txt
View file

@ -30,7 +30,7 @@ ${SPECIFIC_OS_FILES}
${QtSvg_46_SRC} ${QtSvg_46_SRC}
) )
execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") execute_generator(svg QtSvg_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/

2
PySide/QtSvg/typesystem_svg.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtSvg"> <typesystem package="PySide.QtSvg">
<load-typesystem name="typesystem_gui.xml.in" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/>
<object-type name="QSvgRenderer" /> <object-type name="QSvgRenderer" />
<object-type name="QSvgWidget" /> <object-type name="QSvgWidget" />

2
PySide/QtTest/CMakeLists.txt
View file

@ -18,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
${SPECIFIC_OS_FILES} ${SPECIFIC_OS_FILES}
) )
execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") execute_generator(test QtTest_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/

3
PySide/QtTest/typesystem_test.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtTest"> <typesystem package="PySide.QtTest">
<load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/>
<load-typesystem name="typesystem_gui.xml.in" generate="no"/> <!-- FIXME -->
<rejection class="QTest" function-name="qCompare&lt;char&gt;"/> <rejection class="QTest" function-name="qCompare&lt;char&gt;"/>
<rejection class="QTest" function-name="qCompare&lt;char*&gt;"/> <rejection class="QTest" function-name="qCompare&lt;char*&gt;"/>