Fixed most Qt 5.14 deprecation warnings

This commit is contained in:
Mat Sutcliffe
2019-12-31 00:38:59 +00:00
parent 010aaf58b5
commit 4a0d8e9864
40 changed files with 110 additions and 107 deletions

View File

@@ -20,6 +20,7 @@
#include <QStringBuilder>
#include <QtGlobal>
#include <QSysInfo>
#include <QOperatingSystemVersion>
namespace BlackConfig
{
@@ -50,13 +51,8 @@ namespace BlackConfig
bool CBuildConfig::isRunningOnWindows10()
{
#ifdef Q_OS_WIN
// QSysInfo::WindowsVersion only available on Win platforms
if (!CBuildConfig::isRunningOnWindowsNtPlatform()) { return false; }
return (QSysInfo::WindowsVersion == QSysInfo::WV_10_0);
#else
return false;
#endif
return (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10);
}
const QString &CBuildConfig::getPlatformString()
@@ -186,7 +182,7 @@ namespace BlackConfig
{
// Mar 27 2017 20:17:06 (needs to be on english locale, otherwise fails - e.g.
QDateTime dt = QLocale(QLocale::English).toDateTime(CBuildConfig::buildDateAndTime().simplified(), "MMM d yyyy hh:mm:ss");
dt.setUtcOffset(0);
dt.setOffsetFromUtc(0);
return dt;
}
}