diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 10:19:52 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 11:59:35 +0100 |
| commit | 5c121d57911d91f19b066803ad38ca4815255dde (patch) | |
| tree | 728e9206d48968ccbc72dafcd284da4c47b2a9e7 /tests/unit | |
| parent | aeb7ef6b37030ed4beb8f431167d2ef88172486b (diff) | |
| parent | b2ddeacfb5c54d3b0e15c8e6087d21aefaed4d7a (diff) | |
| download | qt-creator-5c121d57911d91f19b066803ad38ca4815255dde.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/unittest/unittest.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index 8f7ca8032a..1db48813e8 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -138,7 +138,6 @@ SOURCES += \ clangdocumentprocessors-test.cpp \ clangdocumentprocessor-test.cpp \ clangdocuments-test.cpp \ - clangdocumentsuspenderresumer-test.cpp \ clangdocument-test.cpp \ clangfixitoperation-test.cpp \ clangfollowsymbol-test.cpp \ @@ -146,7 +145,6 @@ SOURCES += \ clangjobqueue-test.cpp \ clangjobs-test.cpp \ clangparsesupportivetranslationunitjob-test.cpp \ - clangreferencescollector-test.cpp \ clangrequestannotationsjob-test.cpp \ clangrequestreferencesjob-test.cpp \ clangresumedocumentjob-test.cpp \ @@ -177,7 +175,6 @@ SOURCES += \ sqlitetable-test.cpp \ sqlstatementbuilder-test.cpp \ token-test.cpp \ - tokenprocessor-test.cpp \ translationunitupdater-test.cpp \ unsavedfiles-test.cpp \ unsavedfile-test.cpp \ @@ -187,9 +184,11 @@ SOURCES += \ !isEmpty(LIBTOOLING_LIBS) { SOURCES += \ gtest-llvm-printing.cpp \ + clangdocumentsuspenderresumer-test.cpp \ clangquerygatherer-test.cpp \ clangqueryprojectfindfilter-test.cpp \ clangquery-test.cpp \ + clangreferencescollector-test.cpp \ gtest-clang-printing.cpp \ pchcreator-test.cpp \ refactoringclientserverinprocess-test.cpp \ @@ -202,7 +201,8 @@ SOURCES += \ symbolscollector-test.cpp \ testclangtool.cpp \ usedmacrocollector-test.cpp \ - builddependencycollector-test.cpp + builddependencycollector-test.cpp \ + tokenprocessor-test.cpp } !isEmpty(CLANGFORMAT_LIBS) { |