diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-28 12:50:03 +0200 |
| commit | 10098b2508abe6e8df59b7e27ea64e9483f1f8be (patch) | |
| tree | b73815f1e8ca7aa12c347706b410050e3eb22caa /tests/unit/unittest/gtest-creator-printing.cpp | |
| parent | 5dbfd46bcfe177b8308c70a66f7d404429249f6b (diff) | |
| parent | a111f251261159b50e92d6866f2058c66b43e390 (diff) | |
| download | qt-creator-10098b2508abe6e8df59b7e27ea64e9483f1f8be.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
CMakeLists.txt
tests/unit/unittest/unittest.pro
Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
Diffstat (limited to 'tests/unit/unittest/gtest-creator-printing.cpp')
| -rw-r--r-- | tests/unit/unittest/gtest-creator-printing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/unittest/gtest-creator-printing.cpp b/tests/unit/unittest/gtest-creator-printing.cpp index 7ac4a676e3..0ab962dfa5 100644 --- a/tests/unit/unittest/gtest-creator-printing.cpp +++ b/tests/unit/unittest/gtest-creator-printing.cpp @@ -361,7 +361,7 @@ std::ostream &operator<<(std::ostream &out, const WatcherEntry &entry) { out << "(" << entry.id << ", " - << entry.pathId + << entry.filePathId << ")"; return out; |