diff options
Diffstat (limited to 'src/lib/corelib')
| -rw-r--r-- | src/lib/corelib/tools/stlutils.h | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/vsenvironmentdetector.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/tools/stlutils.h b/src/lib/corelib/tools/stlutils.h index 104f88aaf..70e3f2b6d 100644 --- a/src/lib/corelib/tools/stlutils.h +++ b/src/lib/corelib/tools/stlutils.h @@ -58,7 +58,7 @@ template <typename To, typename From, typename Op> To transformed(const From &from, Op op) { To to; - to.reserve(from.size()); + to.reserve(int(from.size())); std::transform(std::cbegin(from), std::cend(from), std::back_inserter(to), std::move(op)); return to; } diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index 06c34a79d..5bcbd93b6 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -64,7 +64,7 @@ static QString windowsSystem32Path() #ifdef Q_OS_WIN wchar_t str[UNICODE_STRING_MAX_CHARS]; if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_SYSTEM, NULL, 0, str))) - return QString::fromUtf16(reinterpret_cast<ushort*>(str)); + return QString::fromUtf16(reinterpret_cast<char16_t*>(str)); #endif return {}; } |