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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
This commit is contained in:
Eike Ziller
2022-07-07 13:28:17 +02:00
parent 1431452069 777ae87779
commit f950a5d86c
122 changed files with 983 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mesonprojectmanager/CMakeLists.txt
View File

@@ -91,6 +91,7 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L
if(WITH_TESTS)
add_qtc_test(tst_mesonwrapper
EXCLUDE_FROM_PRECHECK
INCLUDES
BEFORE "."
DEPENDS
@@ -111,6 +112,7 @@ add_qtc_test(tst_mesonwrapper
)
add_qtc_test(tst_mesoninfoparser
EXCLUDE_FROM_PRECHECK
INCLUDES
BEFORE "."
DEPENDS