diff options
| author | Alexander Shevchenko <sav_ix@ukr.net> | 2018-01-25 14:09:46 +0200 |
|---|---|---|
| committer | Alexander Shevchenko <sav_ix@ukr.net> | 2018-01-27 03:55:53 +0000 |
| commit | 940fd1734b097cbac681298f13193851bf2bf2b9 (patch) | |
| tree | 1ff50756dd0d17c238dbf66954f7b69a9da8f28d /mkspecs/win32-g++/qmake.conf | |
| parent | 9f065554ffea0e3716b76e4bee4a60f0044193ce (diff) | |
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>
Diffstat (limited to 'mkspecs/win32-g++/qmake.conf')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 0a1cd2dd5a..9f366e08b8 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -10,6 +10,8 @@ load(device_config) include(../common/gcc-base.conf) include(../common/g++-base.conf) +include(../common/angle.conf) +include(../common/windows-vulkan.conf) # modifications to gcc-base.conf and g++-base.conf @@ -84,7 +86,4 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P -include(../common/angle.conf) -include(../common/windows-vulkan.conf) - load(qt_config) |