summaryrefslogtreecommitdiffstats
path: root/PySide/QtWebKit
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2010-03-23 14:32:25 -0300
committerHugo Lima <hugo.lima@openbossa.org>2010-03-23 16:42:33 -0300
commit09d40d5b0e33019acaabe5bd66a3874ea103cab8 (patch)
treeda8b0c6f6c9e63d60e764fc489022ae011d969bf /PySide/QtWebKit
parentd4c193277a2ba0fa5d47292160ebc1c12ce9dca0 (diff)
Fix CMakeLists and typesystem of qtwebkit to use the right typesystem file from QtGui.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Reviewer: Lauro Moura <lauro.neto@openbossa.org>
Diffstat (limited to 'PySide/QtWebKit')
-rw-r--r--PySide/QtWebKit/CMakeLists.txt2
-rw-r--r--PySide/QtWebKit/typesystem_webkit.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 8e1e3459..82c550ca 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -44,7 +44,7 @@ ${SPECIFIC_OS_FILES}
${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}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index e19b71da..b0d7338f 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<typesystem package="PySide.QtWebKit">
<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"/>
<namespace-type name="WebCore"/>