diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-25 11:55:48 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-25 11:55:48 +0100 |
| commit | 60c22e8549da8c3391ee8eed9b5af39cfdc5b6a8 (patch) | |
| tree | b26eb8469aea4f5c026603c28fc9284b937b13ba /src/tools | |
| parent | 3fbd95cee4c2bb59d6eef45df06007fead0121ad (diff) | |
| parent | 7a0ee1009b84fd4e6ef8852cc5112a144f3fa50e (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
Change-Id: I170de608eaae795133105dedb76ae6f93f6e0d92
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clangbackend/source/clangfilesystemwatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/clangbackend/source/clangfilesystemwatcher.cpp b/src/tools/clangbackend/source/clangfilesystemwatcher.cpp index a51676abe0..bcd03fac61 100644 --- a/src/tools/clangbackend/source/clangfilesystemwatcher.cpp +++ b/src/tools/clangbackend/source/clangfilesystemwatcher.cpp @@ -60,7 +60,7 @@ QStringList filterExistingFiles(QStringList &&filePaths) filePaths.erase(startOfNonExistingFilePaths, filePaths.end()); - return filePaths; + return std::move(filePaths); } } |