diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-04 14:47:52 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-04 15:17:55 +0200 |
| commit | 1df6443d4a6e58338dfaed7d787debfaeba86756 (patch) | |
| tree | 29ceb6ea3313311287eb5b5216a8a49c1ec0ecfd /src/plugins/pythoneditor/pythoneditorplugin.cpp | |
| parent | 2b7fab166878b759fc8fa29256754a41c3fc6259 (diff) | |
| parent | 6a58666f4403cdde1809784c1cc98668a4b02cfc (diff) | |
| download | qt-creator-1df6443d4a6e58338dfaed7d787debfaeba86756.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/libs/utils/synchronousprocess.cpp
src/plugins/baremetal/iarewtoolchain.cpp
src/plugins/cmakeprojectmanager/cmakeproject.cpp
tests/unit/unittest/CMakeLists.txt
Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
| -rw-r--r-- | src/plugins/pythoneditor/pythoneditorplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index bae2a90f7b..00f5639eb8 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -384,7 +384,7 @@ static QStringList readLinesJson(const Utils::FilePath &projectFile, for (const auto &file : files_array) visited.insert(file.toString()); - lines.append(visited.toList()); + lines.append(Utils::toList(visited)); } return lines; |