diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:14:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-14 15:51:15 +0100 |
| commit | c53ccceff1e1642b7704fa8b0681604c25a833a0 (patch) | |
| tree | 7258d63fba4dabd6f9e2f2f36089ce45df7fe3af /tests/unit/unittest/mocksqlitedatabase.h | |
| parent | 62cafc1782369cde0605fbd6b1182a83d5473a12 (diff) | |
| parent | 429eb73ace5909e228a58bf8b067823e2be44212 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/debugger/debuggerkitinformation.cpp
src/plugins/languageclient/languageclientmanager.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/kit.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
Diffstat (limited to 'tests/unit/unittest/mocksqlitedatabase.h')
| -rw-r--r-- | tests/unit/unittest/mocksqlitedatabase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/unittest/mocksqlitedatabase.h b/tests/unit/unittest/mocksqlitedatabase.h index 0b890e01f0a..5bef2ba8c51 100644 --- a/tests/unit/unittest/mocksqlitedatabase.h +++ b/tests/unit/unittest/mocksqlitedatabase.h @@ -39,8 +39,8 @@ class MockSqliteDatabase : public MockSqliteTransactionBackend { public: - using ReadStatement = MockSqliteReadStatement; - using WriteStatement = MockSqliteWriteStatement; + using ReadStatement = NiceMock<MockSqliteReadStatement>; + using WriteStatement = NiceMock<MockSqliteWriteStatement>; MOCK_METHOD1(execute, void (Utils::SmallStringView sqlStatement)); |