diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2022-05-20 17:52:27 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-05-20 17:52:27 +0200 |
| commit | 2687b36742b00679726a151a7b10e4756d3dc910 (patch) | |
| tree | d6986e2397db87b8be3b498762e485c0b97f4d95 | |
| parent | 3ad842bcd9f9e7c0014e05f4b75ce4ae49a06e29 (diff) | |
| parent | 864f7ed09316e4f629423f1c4f2d05af244e2339 (diff) | |
Merge 1.22 into master
Change-Id: I8438df69b247b30b98a7045adc04e4d43105fa38
| -rw-r--r-- | cmake/QbsBuildConfig.cmake | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/dmcprobe.cpp | 8 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/dmcprobe.h | 2 | ||||
| -rw-r--r-- | src/lib/scriptengine/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cmake/QbsBuildConfig.cmake b/cmake/QbsBuildConfig.cmake index 166afe6d5..a29f550f2 100644 --- a/cmake/QbsBuildConfig.cmake +++ b/cmake/QbsBuildConfig.cmake @@ -142,7 +142,7 @@ function(add_qbs_library target_name) set(library_type STATIC) endif() - string(REGEX REPLACE "\\.[0..9]+$" "" _SOVERSION ${QBS_VERSION}) + string(REGEX REPLACE "\\.[0-9]+$" "" _SOVERSION ${QBS_VERSION}) add_library(${target_name} ${library_type} ${_arg_SOURCES}) target_compile_definitions( diff --git a/src/app/qbs-setup-toolchains/dmcprobe.cpp b/src/app/qbs-setup-toolchains/dmcprobe.cpp index d542f9bcd..cbe113dfd 100644 --- a/src/app/qbs-setup-toolchains/dmcprobe.cpp +++ b/src/app/qbs-setup-toolchains/dmcprobe.cpp @@ -101,7 +101,7 @@ static QStringList dumpOutput(const QFileInfo &compiler, const QStringList &flag args.push_back(QDir::toNativeSeparators(filePath)); QProcess p; - p.start(compiler.absoluteFilePath(), std::move(args)); + p.start(compiler.absoluteFilePath(), args); p.waitForFinished(3000); fakeIn.remove(); static QRegularExpression re(QLatin1String("\\r?\\n")); @@ -144,7 +144,7 @@ static std::optional<Target> dumpDmcTarget(const QFileInfo &compiler, const QStr static std::vector<Profile> createDmcProfileHelper(const ToolchainInstallInfo &info, Settings *settings, - QString profileName = QString()) + QStringView profileName = {}) { const QFileInfo compiler = info.compilerPath; std::vector<Profile> profiles; @@ -241,10 +241,10 @@ bool isDmcCompiler(const QString &compilerName) } void createDmcProfile(const QFileInfo &compiler, Settings *settings, - QString profileName) + QStringView profileName) { const ToolchainInstallInfo info = {compiler, Version{}}; - createDmcProfileHelper(info, settings, std::move(profileName)); + createDmcProfileHelper(info, settings, profileName); } void dmcProbe(Settings *settings, std::vector<Profile> &profiles) diff --git a/src/app/qbs-setup-toolchains/dmcprobe.h b/src/app/qbs-setup-toolchains/dmcprobe.h index a2fbc74cb..3159c2df5 100644 --- a/src/app/qbs-setup-toolchains/dmcprobe.h +++ b/src/app/qbs-setup-toolchains/dmcprobe.h @@ -54,7 +54,7 @@ class Settings; bool isDmcCompiler(const QString &compilerName); void createDmcProfile(const QFileInfo &compiler, qbs::Settings *settings, - QString profileName); + QStringView profileName); void dmcProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles); diff --git a/src/lib/scriptengine/CMakeLists.txt b/src/lib/scriptengine/CMakeLists.txt index deb9b0f8d..7e5a60d69 100644 --- a/src/lib/scriptengine/CMakeLists.txt +++ b/src/lib/scriptengine/CMakeLists.txt @@ -73,8 +73,8 @@ elseif(WIN32) endif() if (MSVC) - set(QT_SCRIPT_CXX_FLAGS "/wd4146" "/wd4244" "/wd4267" "/wd4291" "/wd4334" - "/wd4344" "/wd4396" "/wd4503" "/wd4800" "/wd4819" "/wd4996") + set(QT_SCRIPT_CXX_FLAGS "/wd4018" "/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" |