merged changes from 7.1.0 branch

This commit is contained in:
Luis Ángel San Martín
2014-08-12 10:05:27 +02:00
8 changed files with 146 additions and 75 deletions

View File

@ -29,7 +29,7 @@ bool HttpVersionChecker::checkNewVersion(QString sourceContent)
QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32.*");
#endif
#ifdef Q_OS_LINUX
#if defined Q_OS_UNIX && !defined Q_OS_MAC
QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11.*");
#endif