feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Conflicts:
        src/libs/utils/consoleprocess.h
        src/libs/utils/consoleprocess_unix.cpp
        src/libs/utils/consoleprocess_win.cpp
        src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
        src/tools/clangrefactoringbackend/source/symbolscollector.cpp
        tests/unit/mockup/projectexplorer/project.h

Change-Id: I8d10f26b9bcb54829ba31cdc2272885691df1e16
This commit is contained in:
Eike Ziller
2019-06-18 12:30:00 +02:00
parent d504277901 b02f4ae615
commit 917636b88b
136 changed files with 1068 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -52,7 +52,7 @@ static Abis detectTargetAbis(const FilePath &sdpPath)
if (!sdpPath.fileName().isEmpty()) {
Utils::EnvironmentItems environment = QnxUtils::qnxEnvironment(sdpPath.toString());
foreach (const Utils::EnvironmentItem &item, environment) {
if (item.name == QLatin1Literal("QNX_TARGET"))
if (item.name == QLatin1String("QNX_TARGET"))
qnxTarget = FilePath::fromString(item.value);
}
}