complete support for fervor lib
This commit is contained in:
1 parent
9b250f1ab3
commit
53fc0381a8
5 files changed
+5
-6
No files matched your search
+1
-1
@@ -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 )
|
||||
|
||||
######################################################################################
|
||||
|
||||
@@ -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_ )
|
||||
|
||||
|
||||
+1
-1
@@ -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()
|
||||
|
||||
+1
-1
@@ -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();
|
||||
}
|
||||
@@ -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 );
|
||||
|
||||
Reference in new issue
Block a user