diff options
Diffstat (limited to 'src/corelib/tools/qcollator_win.cpp')
| -rw-r--r-- | src/corelib/tools/qcollator_win.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/tools/qcollator_win.cpp index fcd8d069eb..bce896278e 100644 --- a/src/corelib/tools/qcollator_win.cpp +++ b/src/corelib/tools/qcollator_win.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qcollator_p.h" +#include "qlocale_p.h" #include "qstringlist.h" #include "qstring.h" @@ -61,7 +62,7 @@ void QCollatorPrivate::init() collator = 0; #ifndef USE_COMPARESTRINGEX - localeID = qt_inIsoNametoLCID(locale.bcp47Name().toUtf8().constData()); + localeID = qt_inIsoNametoLCID(QLocalePrivate::get(locale)->bcp47Name().constData()); #else localeName = locale.bcp47Name(); #endif @@ -146,7 +147,7 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const if (finalSize == 0) { qWarning() << "there were problems when generating the ::sortKey by LCMapStringW with error:" << GetLastError(); } - return QCollatorSortKey(new QCollatorSortKeyPrivate(ret)); + return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret))); } int QCollatorSortKey::compare(const QCollatorSortKey &otherKey) const |