From a7de90d0d56fe4b6529917dfa0be972a9983b52b Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Fri, 22 Feb 2019 18:23:39 +0100 Subject: [PATCH] Clang: Use system PCH if projectpart PCH does not exists Then entry can be empty or null, so we test for both. Task-number: QTCREATORBUG-21978 Change-Id: Ic824d897b3c38051a2304c9487ea5f2f7c9eeef8 Reviewed-by: Ivan Donchevskii --- .../source/precompiledheaderstorage.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h index e2d53ee0a94..7d1069b9988 100644 --- a/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h +++ b/src/tools/clangpchmanagerbackend/source/precompiledheaderstorage.h @@ -160,9 +160,10 @@ public: "SELECT systemPchPath FROM precompiledHeaders WHERE projectPartId = (SELECT projectPartId " "FROM projectParts WHERE projectPartName = ?)", m_database}; - mutable ReadStatement m_getPrecompiledHeader{"SELECT projectPchPath, projectPchBuildTime FROM " - "precompiledHeaders WHERE projectPartId = ?", - m_database}; + mutable ReadStatement m_getPrecompiledHeader{ + "SELECT ifnull(nullif(projectPchPath, ''), systemPchPath), " + "projectPchBuildTime FROM precompiledHeaders WHERE projectPartId = ?", + m_database}; }; }