diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 89fc6c85cb2..259b92be832 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3405,7 +3405,7 @@ QByteArray qgetenv(const char *varName) getenv_s(&requiredSize, 0, 0, varName); if (requiredSize == 0) return buffer; - buffer.resize(int(requiredSize)); + buffer.resize(qsizetype(requiredSize)); getenv_s(&requiredSize, buffer.data(), requiredSize, varName); // requiredSize includes the terminating null, which we don't want. Q_ASSERT(buffer.endsWith('\0')); @@ -3466,15 +3466,14 @@ QString qEnvironmentVariable(const char *varName, const QString &defaultValue) { #if defined(Q_OS_WIN) const auto locker = qt_scoped_lock(environmentMutex); - QVarLengthArray wname(int(strlen(varName)) + 1); - for (int i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null + QVarLengthArray wname(qsizetype(strlen(varName)) + 1); + for (qsizetype i = 0; i < wname.size(); ++i) // wname.size() is correct: will copy terminating null wname[i] = uchar(varName[i]); size_t requiredSize = 0; - QString buffer; _wgetenv_s(&requiredSize, 0, 0, wname.data()); if (requiredSize == 0) return defaultValue; - buffer.resize(int(requiredSize)); + QString buffer(qsizetype(requiredSize), Qt::Uninitialized); _wgetenv_s(&requiredSize, reinterpret_cast(buffer.data()), requiredSize, wname.data()); // requiredSize includes the terminating null, which we don't want.