From 8b48c05809dcba387ba716c4bb64ae79ac9b42a1 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Sun, 6 Jan 2019 19:00:08 +0000
Subject: [PATCH] Update templight support.

---
 mkspecs/features/templight.pri | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/mkspecs/features/templight.pri b/mkspecs/features/templight.pri
index db89248ec..b2aa001a5 100644
--- a/mkspecs/features/templight.pri
+++ b/mkspecs/features/templight.pri
@@ -1,18 +1,13 @@
 swiftConfig(templight) {
+    CXXFLAGS_NO_TEMPLIGHT = $$QMAKE_CXXFLAGS
     QMAKE_CXXFLAGS += -Xtemplight -profiler -Xtemplight -ignore-system
     QMAKE_CXXFLAGS += -Xtemplight -blacklist -Xtemplight $$PWD/templight_blacklist
     clang_cl {
         QMAKE_CC = clang-cl
         QMAKE_CXX = templight-cl
-        moc_predefs.commands = clang-cl -Bx$$shell_quote($$shell_path($$QMAKE_QMAKE)) $$QMAKE_CXXFLAGS \
-                               -E -Za ${QMAKE_FILE_IN} 2>NUL >${QMAKE_FILE_OUT} $$escape_expand(\n)$$LITERAL_HASH
+        moc_predefs.commands = clang-cl $$CXXFLAGS_NO_TEMPLIGHT -E -Xclang -dM ${QMAKE_FILE_IN} 2>NUL >${QMAKE_FILE_OUT}
+        moc_predefs.commands += $$escape_expand(\n)$$LITERAL_HASH
     }
-    else:clang {
-        QMAKE_CC = clang
-        QMAKE_CXX = templight++
-        moc_predefs.commands = clang++ $$QMAKE_CXXFLAGS -dM -E -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-    }
-    else:error(Templight requires a clang mkspec)
 
     templight-convert.commands = templight-convert -f callgrind -i ${QMAKE_FILE_IN}.trace.pbf -o ${QMAKE_FILE_OUT}
     templight-convert.CONFIG = no_link