# HG changeset patch # User Wuzzy # Date 1522192973 -7200 # Node ID 6927e51acaefcff75bb5fc4019cba507a35026ab # Parent ee8c6eb0ab47378260ea78a103b468d477e384e4 Fix compile fail due to dependency in Qt 5.10 in pagevideos.cpp diff -r ee8c6eb0ab47 -r 6927e51acaef QTfrontend/ui/page/pagevideos.cpp --- a/QTfrontend/ui/page/pagevideos.cpp Tue Mar 27 23:01:22 2018 +0200 +++ b/QTfrontend/ui/page/pagevideos.cpp Wed Mar 28 01:22:53 2018 +0200 @@ -235,7 +235,23 @@ static QString FileSizeStr(const QString & path) { qint64 size = QFileInfo(path).size(); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) return QLocale().formattedDataSize(size); +#else + qint64 KiB = 1024; + qint64 MiB = 1024*KiB; + qint64 GiB = 1024*MiB; + QString sizeStr; + float fsize = (float) size; + if (size >= GiB) + return QString("%1 GiB").arg(QLocale().toString(fsize/GiB, 'f', 2)); + if (size >= MiB) + return QString("%1 MiB").arg(QLocale().toString(fsize/MiB, 'f', 2)); + if (size >= KiB) + return QString("%1 KiB").arg(QLocale().toString(fsize/KiB, 'f', 2)); + return PageVideos::tr("%1 bytes", "", size).arg(QString::number(size)); +#endif } // set file size in file list in specified row diff -r ee8c6eb0ab47 -r 6927e51acaef share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Tue Mar 27 23:01:22 2018 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Wed Mar 28 01:22:53 2018 +0200 @@ -2251,7 +2251,7 @@ %1 bytes - + %1 Byte %1 Bytes diff -r ee8c6eb0ab47 -r 6927e51acaef share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Tue Mar 27 23:01:22 2018 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Wed Mar 28 01:22:53 2018 +0200 @@ -2139,7 +2139,7 @@ %1 bytes - + %1 byte %1 bytes