From 53fc0381a865d4215efa68e42209cea608ff8dd0 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Mon, 16 Jun 2014 20:29:58 +0100
Subject: [PATCH] complete support for fervor lib

---
 CMakeLists.txt             | 2 +-
 cmake/LibFFmpeg.cmake      | 2 +-
 cmake/LibQT.cmake          | 2 +-
 source/app/main.cpp        | 2 +-
 source/app/plaYUVerApp.cpp | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e0af87..1302b57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,10 +65,10 @@ ADD_OPTION(USE_PIXFC                    "Add PIXFC support"        OFF )
 ######################################################################################
 # Dependencies
 ######################################################################################
+INCLUDE( cmake/LibFervor.cmake )
 INCLUDE( cmake/LibQT.cmake )
 INCLUDE( cmake/LibOpenCV.cmake )
 INCLUDE( cmake/LibFFmpeg.cmake )
-INCLUDE( cmake/LibFervor.cmake )
 INCLUDE( cmake/LibPixfc.cmake )
 
 ######################################################################################
diff --git a/cmake/LibFFmpeg.cmake b/cmake/LibFFmpeg.cmake
index a72f267..d0efd7c 100644
--- a/cmake/LibFFmpeg.cmake
+++ b/cmake/LibFFmpeg.cmake
@@ -90,7 +90,7 @@ IF( USE_FFMPEG )
     SET ( FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES_FULL} )
   ENDIF( NOT WIN32 )
   
-  UNSET( TMP_ )
+  unset(TMP_)
 
   LIST( LENGTH FFMPEG_HEADERS LIST_SIZE_ )
 
diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake
index 787cb50..565a48d 100644
--- a/cmake/LibQT.cmake
+++ b/cmake/LibQT.cmake
@@ -8,7 +8,7 @@ IF( WIN32 )
 ENDIF()
 
 IF( USE_QT4 )
-    FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui QtNetwork )
+    FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui QtNetwork QtWebKit )
     IF( NOT QT4_FOUND)
         SET(USE_QT4 FALSE)
     ENDIF()
diff --git a/source/app/main.cpp b/source/app/main.cpp
index 4c979ae..6c9aae0 100644
--- a/source/app/main.cpp
+++ b/source/app/main.cpp
@@ -40,7 +40,7 @@ int main( int argc, char *argv[] )
   w.show();
   w.parseArgs( argc, argv );
 #ifdef USE_FERVOR
-  FvUpdater::sharedUpdater()->SetFeedURL("/home/joaoc/Programming/PlaYUVerDev/playuver/app-update.xml");
+  FvUpdater::sharedUpdater()->SetFeedURL("http://192.168.96.201/share/jcarreira.it.pub/plaYUVer/playuver-update.xml");
 #endif
   return a.exec();
 }
diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp
index 70db4cc..34d5573 100644
--- a/source/app/plaYUVerApp.cpp
+++ b/source/app/plaYUVerApp.cpp
@@ -1027,8 +1027,7 @@ Void plaYUVerApp::createActions()
 #ifdef USE_FERVOR
   m_arrayActions[UPDATE_ACT] = new QAction( tr( "&Update" ), this );
   m_arrayActions[UPDATE_ACT]->setStatusTip( tr( "Check for updates" ) );
-  connect(m_arrayActions[UPDATE_ACT], SIGNAL(clicked()),
-      FvUpdater::sharedUpdater(), SLOT(CheckForUpdatesNotSilent()));
+  connect( m_arrayActions[UPDATE_ACT], SIGNAL( triggered() ), FvUpdater::sharedUpdater(), SLOT( CheckForUpdatesNotSilent() ) );
 #endif
 
   m_arrayActions[ABOUT_ACT] = new QAction( tr( "&About" ), this );