diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-15 08:58:01 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-16 00:05:37 +0100 |
| commit | ea9c98367734788eb34cebc9b64d917b4b2ebcab (patch) | |
| tree | 119a0f6e7f1aa0b98ee0e581fa3ff81cec6c4502 /src/library/basetrackcache.cpp | |
| parent | 9f3b86ef353ee6741acf927a38f64b4d525a1e37 (diff) | |
| parent | 0d406345b56bafb8d046e372407849c57effdfbe (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
build/debian/control
build/depends.py
res/skins/Tango/loop_jump_controls_left.xml
res/skins/Tango/loop_jump_controls_right.xml
src/engine/enginebuffer.cpp
src/preferences/broadcastprofile.cpp
src/preferences/dialog/dlgpreflibrary.cpp
Diffstat (limited to 'src/library/basetrackcache.cpp')
| -rw-r--r-- | src/library/basetrackcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp index fcceaec9d3..de072871dd 100644 --- a/src/library/basetrackcache.cpp +++ b/src/library/basetrackcache.cpp @@ -729,7 +729,7 @@ int BaseTrackCache::compareColumnValues(int sortColumn, Qt::SortOrder sortOrder, result = 0; } } else { - result = val1.toString().localeAwareCompare(val2.toString()); + result = m_collator.compare(val1.toString(), val2.toString()); } // If we're in descending order, flip the comparison. |