From 940fd1734b097cbac681298f13193851bf2bf2b9 Mon Sep 17 00:00:00 2001
From: Alexander Shevchenko <sav_ix@ukr.net>
Date: Thu, 25 Jan 2018 14:09:46 +0200
Subject: unify windows mkspecs: move angle/vulkan includes

'win32-icc' toolchain:
- remove duplicated angle/vulkan includes.

'win32-g++' toolchain:
- place angle/vulkan includes before the unrelated compiler-related
  variable re-definitions, similarly to the 'win32-clang-msvc',
  'win32-icc', and 'win32-msvc' mkspecs.

Change-Id: Ie04bc9fb1d51ec0366b42713439f680e51214bbc
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/win32-icc/qmake.conf | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mkspecs/win32-icc')

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index cc9c6e7363..6acb07f8aa 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -58,7 +58,4 @@ QMAKE_LFLAGS_LTCG       = $$QMAKE_CFLAGS_LTCG
 
 QMAKE_LIB               = xilib /NOLOGO
 
-include(../common/angle.conf)
-include(../common/windows-vulkan.conf)
-
 load(qt_config)
-- 
cgit v1.2.3