From 3bcc293495f5dc52cfbffcad0d2bfb2e6660244e Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Wed, 9 Jul 2014 13:54:11 +0100
Subject: [PATCH] Improve cmake configuration to use fervor lib in qt5

---
 CMakeLists.txt        | 4 ----
 cmake/LibFervor.cmake | 9 +++++++++
 cmake/LibQT.cmake     | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5caf0d..3f3def4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,10 +124,6 @@ ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HE
 
 TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib ${MODULES_LIBS}  ${LINKER_LIBS} )
 
-IF( NOT USE_QT4)
-    QT5_USE_MODULES( ${PROJECT_NAME} ${CURR_QT_MODULES} )
-ENDIF()
-
 INCLUDE(cmake/Install.cmake)
 
 ######################################################################################
diff --git a/cmake/LibFervor.cmake b/cmake/LibFervor.cmake
index b6fb941..74a4c63 100644
--- a/cmake/LibFervor.cmake
+++ b/cmake/LibFervor.cmake
@@ -13,6 +13,15 @@ IF( USE_FERVOR )
     ADD_SUBDIRECTORY( ${FERVOR_DIR} )
     INCLUDE_DIRECTORIES( ${FERVOR_DIR} )
     LIST(APPEND LINKER_LIBS "Fervor" )
+    
+    FIND_PACKAGE( Qt5Network REQUIRED )
+    FIND_PACKAGE( Qt5WebKit REQUIRED )
+    FIND_PACKAGE( Qt5WebKitWidgets REQUIRED )
+    LIST(APPEND LINKER_LIBS ${FERVOR_DEPENDENCIES} )
+    INCLUDE_DIRECTORIES( ${FERVOR_INCLUDE_DIRS} )
+    
+    SET(QT_USE_QTNETWORK true)
+    SET(QT_USE_QTWEBKIT true)
   ELSE()
     MESSAGE( "Fervor lib source code is not find in ${FERVOR_DIR}... Disabling it!" )
     SET( USE_FERVOR False )
diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake
index 06a0e68..72f919c 100644
--- a/cmake/LibQT.cmake
+++ b/cmake/LibQT.cmake
@@ -25,9 +25,8 @@ IF( NOT USE_QT4 )
     FIND_PACKAGE( Qt5Core REQUIRED )
     FIND_PACKAGE( Qt5Gui REQUIRED )
     FIND_PACKAGE( Qt5Widgets REQUIRED )
-    FIND_PACKAGE( Qt5Network REQUIRED )
-    
-    INCLUDE_DIRECTORIES( ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} )
+ 
+    INCLUDE_DIRECTORIES( ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} )
     # QT5_WRAP_CPP( HEADERS_MOC_FILES ${HEADERS_FILES} )
     QT5_WRAP_UI( FORMS_HEADERS_FILES ${FORMS_FILES} )
     QT5_ADD_RESOURCES( RESOURCES_RCC_FILES ${RESOURCES_FILES} )
@@ -35,6 +34,7 @@ IF( NOT USE_QT4 )
     # Add compiler flags for building executables (-fPIE)
     LIST(APPEND CMAKE_CXX_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} )
     
-    LIST(APPEND LINKER_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} )
+    LIST(APPEND LINKER_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
+    
     SET( CURR_QT_MODULES Core Gui Widgets )
 ENDIF()