summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-02-14 15:43:54 +0100
committerEike Ziller <eike.ziller@qt.io>2020-02-14 15:43:54 +0100
commite40014cb3ac4f37ce222380cac161953cfc4c6ea (patch)
treea42f95583199f0038f8513fb63c814cd3b028726
parent905db66355c82c8b7e2e8fe1c7300f52fcd37787 (diff)
parentf580b6f9f7d5a33204d886f97a9a28b1a8a5a955 (diff)
downloadqt-creator-e40014cb3ac4f37ce222380cac161953cfc4c6ea.tar.gz
Merge remote-tracking branch 'origin/4.12'
Change-Id: Id983ca7f884e7a97ba0de19e1c24f6829f85d96e
-rw-r--r--cmake/QtCreatorAPI.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index e1f0f1a71d..1e0829dd67 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -343,6 +343,12 @@ function(enable_pch target)
return()
endif()
+ # Skip PCH for targets that do not have QT_NO_CAST_TO_ASCII
+ get_target_property(target_defines "${target}" COMPILE_DEFINITIONS)
+ if (NOT "QT_NO_CAST_TO_ASCII" IN_LIST target_defines)
+ return()
+ endif()
+
get_target_property(target_type ${target} TYPE)
if (NOT ${target_type} STREQUAL "OBJECT_LIBRARY")
function(_recursively_collect_dependencies input_target)