diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp index bc577eba267..c245990f7f0 100644 --- a/src/libs/utils/consoleprocess_win.cpp +++ b/src/libs/utils/consoleprocess_win.cpp @@ -120,14 +120,14 @@ bool ConsoleProcess::start(const QString &program, const QString &args) ZeroMemory(d->m_pid, sizeof(PROCESS_INFORMATION)); QString workDir = QDir::toNativeSeparators(workingDirectory()); - if (!workDir.isEmpty() && !workDir.endsWith('\\')) - workDir.append('\\'); + if (!workDir.isEmpty() && !workDir.endsWith(QLatin1Char('\\'))) + workDir.append(QLatin1Char('\\')); QStringList stubArgs; stubArgs << modeOption(d->m_mode) << d->m_stubServer.fullServerName() << workDir - << (d->m_tempFile ? d->m_tempFile->fileName() : 0) + << (d->m_tempFile ? d->m_tempFile->fileName() : QString()) << createWinCommandline(pcmd, pargs) << msgPromptToClose(); diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 47b747cb058..8703eb6da51 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -48,7 +48,7 @@ public: lib.cd(QLatin1String("../lib")); QString toReplace = lib.path(); lib.cd(QLatin1String("qtcreator")); - toReplace.append(QLatin1String(":")); + toReplace.append(QLatin1Char(':')); toReplace.append(lib.path()); if (ldLibraryPath.startsWith(toReplace)) diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp index a6386866bf8..e34d4bd49da 100644 --- a/src/libs/utils/environmentmodel.cpp +++ b/src/libs/utils/environmentmodel.cpp @@ -153,8 +153,8 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const if (role == Qt::ToolTipRole && value.length() > 80) { // Use html to enable text wrapping value = Qt::escape(value); - value.prepend(""); - value.append(""); + value.prepend(QLatin1String("")); + value.append(QLatin1String("")); } return value; } diff --git a/src/libs/utils/tcpportsgatherer.cpp b/src/libs/utils/tcpportsgatherer.cpp index 82f93e97d56..5ee15f1ddd1 100644 --- a/src/libs/utils/tcpportsgatherer.cpp +++ b/src/libs/utils/tcpportsgatherer.cpp @@ -169,7 +169,7 @@ void TcpPortsGathererPrivate::updateLinux(TcpPortsGatherer::ProtocolFlags protoc )); while (!file.atEnd()) { QByteArray line = file.readLine(); - if (pattern.indexIn(line) != -1) { + if (pattern.indexIn(QLatin1String(line)) != -1) { bool isNumber; quint16 port = pattern.cap(1).toUShort(&isNumber, 16); QTC_ASSERT(isNumber, continue); @@ -213,12 +213,12 @@ void TcpPortsGathererPrivate::updateNetstat(TcpPortsGatherer::ProtocolFlags prot "\\s+\\d+" // whitespace, number (Recv-Q) "\\s+\\d+" // whitespace, number (Send-Q) "\\s+(\\S+)")); // whitespace, Local Address - if (pattern.indexIn(line) != -1) { + if (pattern.indexIn(QLatin1String(line)) != -1) { QString localAddress = pattern.cap(1); // Examples of local addresses: // '*.56501' , '*.*' 'fe80::1%lo0.123' - int portDelimiterPos = localAddress.lastIndexOf("."); + int portDelimiterPos = localAddress.lastIndexOf(QLatin1Char('.')); if (portDelimiterPos == -1) continue; diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 5335d112229..59d29ed10c0 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -9,6 +9,8 @@ QT += script network CONFIG += exceptions # used by portlist.cpp, textfileformat.cpp, and ssh/* +DEFINES += QT_NO_CAST_FROM_ASCII + win32-msvc* { # disable warnings caused by botan headers QMAKE_CXXFLAGS += -wd4250 -wd4290 diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 6d93ff3ba29..34cd5d0a13c 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary QtcLibrary { name: "Utils" - cpp.defines: base.concat(["QTCREATOR_UTILS_LIB"]) + cpp.defines: base.concat(["QTCREATOR_UTILS_LIB", "QT_NO_CAST_FROM_ASCII"]) Properties { condition: qbs.targetOS == "windows"