1 files changed, 57 insertions, 48 deletions
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index 4e7b97d53b..9ae0b9c9a9 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -20,8 +20,10 @@ add_qtc_test(unittest GTEST
     Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui
     Googletest
     clangrefactoringbackend_lib clangbackend_lib clangpchmanagerbackend_lib
-    CPlusPlus Sqlite Utils
+    CPlusPlus Utils
   DEFINES
+    QT_NO_CAST_TO_ASCII
+    QT_RESTRICTED_CAST_FROM_ASCII
     UNIT_TESTS
     DONT_CHECK_MESSAGE_COUNTER
     QTC_RESOURCE_DIR="${PROJECT_SOURCE_DIR}/share/qtcreator"
@@ -62,6 +64,7 @@ add_qtc_test(unittest GTEST
     gtest-creator-printing.cpp gtest-creator-printing.h
     gtest-llvm-printing.h
     gtest-qt-printing.cpp gtest-qt-printing.h
+    gtest-std-printing.h
     headerpathfilter-test.cpp
     highlightingresultreporter-test.cpp
     lineprefixer-test.cpp
@@ -164,6 +167,21 @@ add_qtc_test(unittest GTEST
     unittest-utility-functions.h
     usedmacrofilter-test.cpp
     utf8-test.cpp
+    sqlitecolumn-test.cpp
+    sqlitedatabasebackend-test.cpp
+    sqlitedatabase-test.cpp
+    sqlitestatement-test.cpp
+    sqlitetable-test.cpp
+    sqlstatementbuilder-test.cpp
+    createtablesqlstatementbuilder-test.cpp
+    sqlitevalue-test.cpp
+)
+
+extend_qtc_test(unittest
+  DEFINES
+    $<TARGET_PROPERTY:Sqlite,INTERFACE_COMPILE_DEFINITIONS>
+  SOURCES
+    ../../../src/libs/3rdparty/sqlite/sqlite3.c
 )
 
 # Do not work on the source directory data
@@ -183,8 +201,11 @@ string(REPLACE "$$QTCREATOR_COPYRIGHT_YEAR" "${IDE_COPYRIGHT_YEAR}" plugin_json_
 string(REPLACE "$$dependencyList" "\"Dependencies\" : []" plugin_json_in ${plugin_json_in})
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CppTools.json" ${plugin_json_in}})
 
-if (TARGET libclang)
-  target_sources(unittest PRIVATE
+extend_qtc_test(unittest
+  CONDITION TARGET libclang
+  INCLUDES "${CLANG_INCLUDE_DIRS}"
+  DEPENDS libclang
+  SOURCES
     activationsequencecontextprocessor-test.cpp
     activationsequenceprocessor-test.cpp
     chunksreportedmonitor.cpp
@@ -219,7 +240,6 @@ if (TARGET libclang)
     codecompleter-test.cpp
     codecompletionsextractor-test.cpp
     completionchunkstotextconverter-test.cpp
-    createtablesqlstatementbuilder-test.cpp
     cursor-test.cpp
     diagnosticset-test.cpp
     diagnostic-test.cpp
@@ -228,12 +248,6 @@ if (TARGET libclang)
     skippedsourceranges-test.cpp
     sourcelocation-test.cpp
     sourcerange-test.cpp
-    sqlitecolumn-test.cpp
-    sqlitedatabasebackend-test.cpp
-    sqlitedatabase-test.cpp
-    sqlitestatement-test.cpp
-    sqlitetable-test.cpp
-    sqlstatementbuilder-test.cpp
     token-test.cpp
     translationunitupdater-test.cpp
     unsavedfiles-test.cpp
@@ -243,14 +257,13 @@ if (TARGET libclang)
     clangasyncjob-base.h
     clangcompareoperators.h
     diagnosticcontainer-matcher.h
-  )
-  target_include_directories(unittest PRIVATE "${CLANG_INCLUDE_DIRS}")
-  target_link_libraries(unittest PRIVATE libclang)
-endif()
+)
 
-if (TARGET clangTooling)
-  target_compile_definitions(unittest PRIVATE CLANG_UNIT_TESTS)
-  target_sources(unittest PRIVATE
+extend_qtc_test(unittest
+  CONDITION TARGET clangTooling
+  DEFINES CLANG_UNIT_TESTS
+  DEPENDS clangTooling clangIndex clangQuery
+  SOURCES
     gtest-llvm-printing.cpp
     clangquerygatherer-test.cpp
     clangqueryprojectfindfilter-test.cpp
@@ -270,37 +283,35 @@ if (TARGET clangTooling)
     builddependencycollector-test.cpp
     mockrefactoringclient.h
     mockrefactoringserver.h
-  )
-  target_link_libraries(unittest
-    PRIVATE clangTooling clangIndex clangQuery)
-endif()
+)
 
-if (TARGET clangFormat)
-  target_sources(unittest PRIVATE
+extend_qtc_test(unittest
+  CONDITION TARGET clangFormat
+  DEPENDS clangFormat
+  SOURCES
     clangformat-test.cpp
-  )
-  target_link_libraries(unittest PRIVATE clangFormat)
-endif()
+)
 
-if (TARGET GoogleBenchmark)
-  target_sources(unittest PRIVATE
+extend_qtc_test(unittest
+  CONDITION TARGET GoogleBenchmark
+  DEPENDS GoogleBenchmark
+  SOURCES
     smallstring-benchmark.cpp
-  )
-  target_link_libraries(unittest PRIVATE GoogleBenchmark)
-endif()
+)
 
-finalize_qtc_gtest(unittest)
+finalize_qtc_gtest(unittest ".c$")
 
 # Path needs to be before CppTools
 target_include_directories(unittest
   PRIVATE
     BEFORE $<TARGET_PROPERTY:clangrefactoringbackend_lib,INTERFACE_INCLUDE_DIRECTORIES>
-    BEFORE $<TARGET_PROPERTY:ClangRefactoring,INTERFACE_INCLUDE_DIRECTORIES>
+    BEFORE ../../../src/plugins/clangrefactoring
+    BEFORE ../../../src/plugins
 )
 
 get_target_property(ClangSupportSources ClangSupport SOURCES)
 get_target_property(ClangSupportSourcesDir ClangSupport SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${ClangSupportSourcesDir}"
   SOURCES ${ClangSupportSources}
   DEFINES
@@ -311,7 +322,7 @@ extend_qtc_target(unittest
 )
 
 get_target_property(ClangCodeModelSourcesDir ClangCodeModel SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${ClangCodeModelSourcesDir}"
   SOURCES
     clangactivationsequencecontextprocessor.cpp clangactivationsequencecontextprocessor.h
@@ -326,25 +337,25 @@ extend_qtc_target(unittest
 )
 
 get_target_property(CompilationDatabasePMSourcesDir CompilationDatabaseProjectManager SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${CompilationDatabasePMSourcesDir}"
   SOURCES
     compilationdatabaseutils.cpp compilationdatabaseutils.h
 )
 
 get_target_property(CoreSourcesDir Core SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${CoreSourcesDir}"
   DEFINES CORE_STATIC_LIBRARY
   SOURCES
     coreicons.cpp coreicons.h
-    id.cpp id.h
+    id.h
     find/ifindfilter.cpp find/ifindfilter.h
     locator/ilocatorfilter.cpp locator/ilocatorfilter.h
 )
 
 get_target_property(CppToolsSourcesDir CppTools SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${CppToolsSourcesDir}"
   DEFINES CPPTOOLS_STATIC_LIBRARY
   SOURCES
@@ -360,16 +371,15 @@ extend_qtc_target(unittest
 )
 
 get_target_property(ProjectExplorerSourcesDir ProjectExplorer SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${ProjectExplorerSourcesDir}"
   DEFINES PROJECTEXPLORER_STATIC_LIBRARY
   SOURCES
     projectmacro.cpp projectmacro.h
 )
 
-get_target_property(ClangRefactoringSourcesDir ClangRefactoring SOURCES_DIR)
-extend_qtc_target(unittest
-  SOURCES_PREFIX "${ClangRefactoringSourcesDir}"
+extend_qtc_test(unittest
+  SOURCES_PREFIX ../../../src/plugins/clangrefactoring
   SOURCES
     clangqueryexamplehighlighter.cpp clangqueryexamplehighlighter.h
     clangqueryexamplehighlightmarker.h
@@ -383,7 +393,7 @@ extend_qtc_target(unittest
     refactoringprojectupdater.cpp refactoringprojectupdater.h
     searchinterface.h
     searchhandle.cpp searchhandle.h
-    symbolsfindfilter.cpp symbolsfindfilter.h
+    clangsymbolsfindfilter.cpp clangsymbolsfindfilter.h
     symbolqueryinterface.h
     symbol.h
     projectpartproviderinterface.h
@@ -391,9 +401,8 @@ extend_qtc_target(unittest
     locatorfilter.cpp locatorfilter.h
 )
 
-get_target_property(ClangPchManagerSourcesDir ClangPchManager SOURCES_DIR)
-extend_qtc_target(unittest
-  SOURCES_PREFIX "${ClangPchManagerSourcesDir}"
+extend_qtc_test(unittest
+  SOURCES_PREFIX ../../../src/plugins/clangpchmanager
   DEFINES CLANGPCHMANAGER_STATIC_LIB
   SOURCES
     clangindexingprojectsettings.cpp clangindexingprojectsettings.h
@@ -410,7 +419,7 @@ extend_qtc_target(unittest
 )
 
 get_target_property(ClangFormatSourcesDir ClangFormat SOURCES_DIR)
-extend_qtc_target(unittest
+extend_qtc_test(unittest
   SOURCES_PREFIX "${ClangFormatSourcesDir}"
   DEFINES CLANGPCHMANAGER_STATIC_LIB
   SOURCES