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

Fix CMakeLists and typesystem of qtwebkit to use the right typesystem file from QtGui.

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Reviewer: Lauro Moura <lauro.neto@openbossa.org>
This commit is contained in:
Hugo Lima 2010-03-23 14:32:25 -03:00
commit 09d40d5b0e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PySide/QtWebKit/CMakeLists.txt
View file

@ -44,7 +44,7 @@ ${SPECIFIC_OS_FILES}
${QtWebKit_46_SRC} ${QtWebKit_46_SRC}
) )
execute_generator(webkit QtWebKit_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}") execute_generator(webkit QtWebKit_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/

2
PySide/QtWebKit/typesystem_webkit.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtWebKit"> <typesystem package="PySide.QtWebKit">
<load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_core.xml" generate="no"/>
<load-typesystem name="typesystem_gui.xml.in" generate="no"/> <!-- FIXME --> <load-typesystem name="typesystem_gui.xml" generate="no"/>
<load-typesystem name="typesystem_network.xml" generate="no"/> <load-typesystem name="typesystem_network.xml" generate="no"/>
<namespace-type name="WebCore"/> <namespace-type name="WebCore"/>