diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-03-24 12:40:59 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2022-03-25 15:00:01 +0000 |
| commit | e6d0980e47601dbb80f40672781a2940c566fb77 (patch) | |
| tree | ea56e635e6f279da279d73b8f4bdca1a19b700f0 | |
| parent | b576f53bf30188a0fa97a6c9a8dc5c3f92c20678 (diff) | |
Fix/suppress compiler warnings with Qt6/MSVC
Change-Id: Ic3a13c71a841a3e6c31a2c6d06c79836a54318fb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/tools/stlutils.h | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/vsenvironmentdetector.cpp | 2 | ||||
| -rw-r--r-- | src/lib/scriptengine/CMakeLists.txt | 3 |
3 files changed, 4 insertions, 3 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 {}; } diff --git a/src/lib/scriptengine/CMakeLists.txt b/src/lib/scriptengine/CMakeLists.txt index 0533cfac5..deb9b0f8d 100644 --- a/src/lib/scriptengine/CMakeLists.txt +++ b/src/lib/scriptengine/CMakeLists.txt @@ -73,7 +73,8 @@ elseif(WIN32) endif() if (MSVC) - set(QT_SCRIPT_CXX_FLAGS "/wd4291" "/wd4344" "/wd4396" "/wd4503" "/wd4800" "/wd4819" "/wd4996") + set(QT_SCRIPT_CXX_FLAGS "/wd4146" "/wd4244" "/wd4267" "/wd4291" "/wd4334" + "/wd4344" "/wd4396" "/wd4503" "/wd4800" "/wd4819" "/wd4996") else() set(QT_SCRIPT_CXX_FLAGS "-fno-strict-aliasing" "-w" "-Wall" "-Wreturn-type" "-Wcast-align" "-Wchar-subscripts" |