From 968b41aa743bd221c98633b4ba468b1912c38877 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Thu, 24 Dec 2020 13:27:49 +0200
Subject: [PATCH] Improve suppressing a compiler warnings on macos.

---
 common.pri | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/common.pri b/common.pri
index 9cf33735d..4de506316 100644
--- a/common.pri
+++ b/common.pri
@@ -346,27 +346,22 @@ ISYSTEM += \
     -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent"
 
 } else {
-ISYSTEM += \
-    -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtXml.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtXml.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtGui.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtGui.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtXmlPatterns.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtXmlPatterns.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtCore.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtCore.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtPrintSupport.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtPrintSupport.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtSvg.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtSvg.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtNetwork.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtNetwork.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Versions/5/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Headers/" \
-    -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/"
+LIBS_USED_FOR_QT = \
+    QtCore \
+    QtSvg \
+    QtXml \
+    QtPrintSupport \
+    QtXmlPatterns \
+    QtWidgets \
+    QtGui \
+    QtNetwork \
+    QtTest \
+    QtConcurrent
+
+for(somelib, $$list($$LIBS_USED_FOR_QT)) {
+    ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Versions/5/Headers/
+    ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Headers/
+}
 }
 
 # Usefull GCC warnings keys.