1 files changed, 0 insertions, 41 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/external/meta-qt5/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
deleted file mode 100644
index 182f8b6f..00000000
--- a/external/meta-qt5/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c72e38a57ff13ded19fcc22c5abba1a69ba84040 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 6 Dec 2018 15:06:20 -0800
-Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
-
-This is required when using clang for compiler, fixes
-mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- mkspecs/features/toolchain.prf | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index fdf3d1cdd3..6ecfd391f6 100644
---- a/mkspecs/features/toolchain.prf
-+++ b/mkspecs/features/toolchain.prf
-@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) {
-     return($$ret)
- }
- 
-+defineReplace(qtVariablesFromCLANG) {
-+    ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \
-+        <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
-+    !equals(ec, 0): qtCompilerErrror($$1, $$ret)
-+    return($$ret)
-+}
-+
- isEmpty($${target_prefix}.COMPILER_MACROS) {
-     msvc {
-         clang_cl {
-@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
-         } else {
-             vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
-         }
-+    } else: clang {
-+        vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS)
-     } else: gcc {
-         vars = $$qtVariablesFromGCC($$QMAKE_CXX)
-     }