diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:55 +0200 |
| commit | 917636b88b2b8b4a7e3d945671b978504df5bc3f (patch) | |
| tree | e0e13633c5e281ddd6c6a6bd67c190a0331532b0 /src/plugins/clangrefactoring | |
| parent | d504277901279d8b01efe1da8b21fc0ec9290c9c (diff) | |
| parent | b02f4ae6154810a9894615eca3052957e6e3ec56 (diff) | |
| download | qt-creator-917636b88b2b8b4a7e3d945671b978504df5bc3f.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
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
Diffstat (limited to 'src/plugins/clangrefactoring')
| -rw-r--r-- | src/plugins/clangrefactoring/refactoringprojectupdater.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/clangrefactoring/refactoringprojectupdater.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp index 8cfd5b942a..20a9fce730 100644 --- a/src/plugins/clangrefactoring/refactoringprojectupdater.cpp +++ b/src/plugins/clangrefactoring/refactoringprojectupdater.cpp @@ -30,9 +30,7 @@ namespace ClangRefactoring { -void RefactoringProjectUpdater::precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId, - const QString &, - long long) +void RefactoringProjectUpdater::precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId) { const QString projectPartName = fetchProjectPartName(projectPartId); diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.h b/src/plugins/clangrefactoring/refactoringprojectupdater.h index 643bf74667..01e96cb0a4 100644 --- a/src/plugins/clangrefactoring/refactoringprojectupdater.h +++ b/src/plugins/clangrefactoring/refactoringprojectupdater.h @@ -48,9 +48,7 @@ public: { } - void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId, - const QString &pchFilePath, - long long lastModified) override; + void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId) override; void precompiledHeaderRemoved(ClangBackEnd::ProjectPartId projectPartId) override; private: |