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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h

Change-Id: I43d2571617bfbf41c0fcf23502ab77975540eba4
This commit is contained in:
Eike Ziller
2018-01-17 09:30:57 +01:00
parent 76bc20ffce 2765409d2b
commit 115afed94b
113 changed files with 3769 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/clangsupport/clangpathwatcher.h
View File

@@ -77,7 +77,7 @@ using IdCache = StringCache<Utils::SmallString,
template <typename FileSystemWatcher,
typename Timer>
class ClangPathWatcher : public ClangPathWatcherInterface
class CLANGSUPPORT_EXPORT ClangPathWatcher : public ClangPathWatcherInterface
{
public:
ClangPathWatcher(FilePathCachingInterface &pathCache,