From 09d40d5b0e33019acaabe5bd66a3874ea103cab8 Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Tue, 23 Mar 2010 14:32:25 -0300
Subject: 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>
---
 PySide/QtWebKit/CMakeLists.txt        | 2 +-
 PySide/QtWebKit/typesystem_webkit.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'PySide/QtWebKit')

diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 8e1e34592..82c550ca1 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 e19b71da7..b0d7338f8 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"/>
-- 
cgit v1.2.3