Merge pull request #4972 from Chocobo1/travis_trusty

TravisCI: switch to Trusty image
This commit is contained in:
sledgehammer999 2016-03-20 12:09:09 -05:00
commit edb8670dc0
2 changed files with 69 additions and 48 deletions

View file

@ -642,7 +642,7 @@ QString Utils::Misc::osName()
{
// static initialization for usage in signal handler
static const QString name =
#ifdef QBT_USES_QT5
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
QString("%1 %2 %3")
.arg(QSysInfo::prettyProductName())
.arg(QSysInfo::kernelVersion())