fixed compilation of YACReaderLibrary and YACReaderLibraryServer, removing all the dependecies on QtWidgets from non gui code

This commit is contained in:
Luis Ángel San Martín
2015-12-12 12:10:37 +01:00
parent c1e14aea1f
commit e1de588e40
24 changed files with 48 additions and 68 deletions

View File

@ -96,6 +96,8 @@ void logSystemAndConfig()
QLOG_INFO() << "7z : found";
else
QLOG_ERROR() << "7z : not found";
/*
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if(QFileInfo(QString(BINDIR)+"/qrencode").exists())
#else
@ -104,18 +106,7 @@ void logSystemAndConfig()
QLOG_INFO() << "qrencode : found";
else
QLOG_INFO() << "qrencode : not found";
QSettings settings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat);
settings.beginGroup("libraryConfig");
if(settings.value(SERVER_ON,true).toBool())
QLOG_INFO() << "server : enabled";
else
QLOG_INFO() << "server : disabled";
if(settings.value(USE_OPEN_GL).toBool())
QLOG_INFO() << "OpenGL : enabled" << " - " << (settings.value(V_SYNC).toBool()?"VSync on":"VSync off");
else
QLOG_INFO() << "OpenGL : disabled";
*/
QLOG_INFO() << "Libraries: " << DBHelper::getLibraries().getLibraries();
QLOG_INFO() << "--------------------------------------------";
@ -204,18 +195,14 @@ int main( int argc, char ** argv )
qRegisterMetaType<ComicDB>("ComicDB");
#ifdef SERVER_RELEASE
QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor
settings->beginGroup("libraryConfig");
s = new Startup();
s->start();
if(settings->value(SERVER_ON,true).toBool())
{
s->start();
}
#endif
QLOG_INFO() << "YACReaderLibrary attempting to start";
QLOG_INFO() << "YACReaderLibraryServer attempting to start";
logSystemAndConfig();