diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-01-26 14:04:25 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-01-28 12:18:35 +0000 |
| commit | ed05ce484dc18279bfa5ac7f0575ad93e9ecf9e2 (patch) | |
| tree | 96123665ba00264f7557d3cb899385661bced9be | |
| parent | 58b84a676184813fea885243a7ccacc8af5b94de (diff) | |
clang-cl: Fix build warnings
Those are treated as errors and fail build on Travis
Change-Id: I6ce46434cb37af936f25836dc857ed65f0b5cd1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | examples/code-generator/code-generator.qbs | 4 | ||||
| -rw-r--r-- | src/app/qbs/session.cpp | 5 | ||||
| -rw-r--r-- | src/lib/corelib/api/runenvironment.h | 4 | ||||
| -rw-r--r-- | src/lib/corelib/tools/msvcinfo.cpp | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index df15dec5e..1c2d2e445 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -55,6 +55,10 @@ Project { name: "hwgen" consoleApplication: true files: ["hwgen.cpp"] + Properties { + condition: qbs.toolchain.contains("gcc") || qbs.toolchain.contains("clang-cl") + cpp.cxxFlags: ["-Wno-deprecated-declarations"] + } } // Generate and build a hello-world application. diff --git a/src/app/qbs/session.cpp b/src/app/qbs/session.cpp index 7e141b4a6..3307f5866 100644 --- a/src/app/qbs/session.cpp +++ b/src/app/qbs/session.cpp @@ -186,7 +186,10 @@ Session::Session() #ifdef Q_OS_WIN32 // Make sure the line feed character appears as itself. if (_setmode(_fileno(stdout), _O_BINARY) == -1) { - std::cerr << "Failed to set stdout to binary mode: " << std::strerror(errno) << std::endl; + constexpr size_t errmsglen = FILENAME_MAX; + char errmsg[errmsglen]; + strerror_s(errmsg, errmsglen, errno); + std::cerr << "Failed to set stdout to binary mode: " << errmsg << std::endl; qApp->exit(EXIT_FAILURE); } #endif diff --git a/src/lib/corelib/api/runenvironment.h b/src/lib/corelib/api/runenvironment.h index 69603bf76..c5123ca9c 100644 --- a/src/lib/corelib/api/runenvironment.h +++ b/src/lib/corelib/api/runenvironment.h @@ -52,6 +52,8 @@ class QString; class QStringList; QT_END_NAMESPACE +class TestApi; + namespace qbs { class ErrorInfo; class InstallOptions; @@ -66,7 +68,7 @@ class QBS_EXPORT RunEnvironment { friend class CommandLineFrontend; friend class Project; - friend class TestApi; + friend class ::TestApi; public: ~RunEnvironment(); diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index cffec85b2..4e71950e8 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -163,7 +163,7 @@ static QVariantMap getMsvcDefines(const QString &compilerFilePath, QStringList out = QString::fromLocal8Bit(runProcess(compilerFilePath, QStringList() << QStringLiteral("/nologo") << backendSwitch - << QString::fromWCharArray(_wgetenv(L"COMSPEC")) + << qEnvironmentVariable("COMSPEC") << QStringLiteral("/c") << languageSwitch << QStringLiteral("NUL"), |