diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-06-24 08:49:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-06-24 10:43:10 +0200 |
| commit | 6bc9cddb9e52111bad40fc2f3d3ad20773b211d2 (patch) | |
| tree | 10330e6097ca490dffc2e08cd381daaf0e6403d1 /src/libs/3rdparty/cplusplus | |
| parent | dda115d0d8ad73de3b26fe94d5aca45a02818209 (diff) | |
| parent | afa421887165fc33b100a00ae6908952dc102945 (diff) | |
Merge remote-tracking branch 'origin/4.15' into 5.0
Conflicts:
src/plugins/cmakeprojectmanager/projecttreehelper.cpp
src/plugins/coreplugin/mainwindow.cpp
Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/CMakeLists.txt b/src/libs/3rdparty/cplusplus/CMakeLists.txt index b8a8607a8c..f2515c9c3a 100644 --- a/src/libs/3rdparty/cplusplus/CMakeLists.txt +++ b/src/libs/3rdparty/cplusplus/CMakeLists.txt @@ -41,5 +41,14 @@ add_qtc_library(3rd_cplusplus OBJECT Type.cpp Type.h TypeVisitor.cpp TypeVisitor.h cppassert.h + SKIP_PCH PROPERTIES POSITION_INDEPENDENT_CODE ON ) + +if(TARGET 3rd_cplusplus) + qtc_enable_release_for_debug_configuration() + if (BUILD_WITH_PCH) + target_precompile_headers(3rd_cplusplus PRIVATE + "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h") + endif() +endif() |