github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 05:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3920 from Gelmir/qt5fix

Browse source 
Fix Qt5 build
This commit is contained in:
sledgehammer999 2015-10-11 16:26:52 -05:00
commit 522ff3b611
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/misc.cpp
View file

@ -669,7 +669,7 @@ misc::NaturalCompare::NaturalCompare()
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// Without ICU library, QCollator doesn't support `setNumericMode(true)` on OS older than Win7 // Without ICU library, QCollator doesn't support `setNumericMode(true)` on OS older than Win7
if(SysInfo::windowsVersion() < QSysInfo::WV_WINDOWS7) if(QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS7)
return; return;
#endif #endif
m_collator.setNumericMode(true); m_collator.setNumericMode(true);
@ -682,7 +682,7 @@ bool misc::NaturalCompare::operator()(const QString &l, const QString &r)
#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// Without ICU library, QCollator doesn't support `setNumericMode(true)` on OS older than Win7 // Without ICU library, QCollator doesn't support `setNumericMode(true)` on OS older than Win7
if(SysInfo::windowsVersion() < QSysInfo::WV_WINDOWS7) if(QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS7)
return lessThan(l, r); return lessThan(l, r);
#endif #endif
return (m_collator.compare(l, r) < 0); return (m_collator.compare(l, r) < 0);