Merge remote-tracking branch 'origin/4.15' into 5.0

Conflicts:
	src/plugins/cmakeprojectmanager/projecttreehelper.cpp
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
This commit is contained in:
Eike Ziller
2021-06-24 08:49:00 +02:00
9 changed files with 55 additions and 15 deletions

View File

@@ -40,4 +40,13 @@ add_qtc_library(CPlusPlus
pp-engine.h pp-scanner.cpp
pp-scanner.h
pp.h
SKIP_PCH
)
if(TARGET CPlusPlus)
qtc_enable_release_for_debug_configuration()
if (BUILD_WITH_PCH)
target_precompile_headers(CPlusPlus PRIVATE
"${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h")
endif()
endif()