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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
This commit is contained in:
Eike Ziller
2021-12-16 10:50:33 +01:00
parent 7c674e0a5b 21c1d8fd60
commit 85b60d9608
156 changed files with 2801 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/QtCreatorAPI.cmake
+2 -1
View File
@@ -869,7 +869,7 @@ function(finalize_qtc_gtest test_name exclude_sources_regex)
list(FILTER test_sources EXCLUDE REGEX "${exclude_sources_regex}")
endif()
include(GoogleTest)
gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list)
gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list SKIP_DEPENDENCY)
foreach(test IN LISTS test_list)
finalize_test_setup(${test})
@@ -1021,6 +1021,7 @@ function(qtc_add_resources target resourceName)
target_sources(${target} PRIVATE "${generatedSourceCode}")
set_property(SOURCE "${generatedSourceCode}" PROPERTY SKIP_AUTOGEN ON)
set_property(SOURCE "${generatedResourceFile}.in" PROPERTY SKIP_AUTOGEN ON)
endfunction()
function(qtc_add_public_header header)