From e53da0d1bc137df591fa4e97261a55daef8f2905 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 4 May 2015 10:06:56 +0200
Subject: Ignore 3rdParty warnings on Linux platforms when using Clang or GCC

Test-Information:

Tested behavior on Elementary OS 0.2.1.

Change-Id: Icc0611181fbf7dbe22d6c0c8cb18be9c1cdbc138

diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index e019b2c..be8621b 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -473,7 +473,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
 
 
 	include_flag = "-I"
-	if self["CC"] in ("gcc", "clang"):
+	if os.path.basename(self["CC"]) in ("gcc", "clang"):
 		include_flag = "-isystem"
 
 
@@ -489,15 +489,15 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
 		if not UsePkgConfig:
 			if debug : debugSuffix = '_debug'
 			if version == '4' :
-				self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
+				self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR", "include", "phonon")])
 			for module in modules :
 				module_str = module
 				if not version == '4' :
 					module_str = module_str.replace('Qt', 'Qt5')
 				self.AppendUnique(LIBS=[module_str+debugSuffix])
 				self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
-				self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
-				self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)])
+				self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include")])
+				self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include", module)])
 			self["QT4_MOCCPPPATH"] = self["CPPPATH"]
 			return
 		else:
-- 
cgit v0.10.2-6-g49f6