diff options
| author | Alexander Shevchenko <sav_ix@ukr.net> | 2018-01-21 10:59:15 +0200 |
|---|---|---|
| committer | Alexander Shevchenko <sav_ix@ukr.net> | 2018-01-22 17:41:01 +0000 |
| commit | 41cdfbe3a473a4f691c193a58206d860cb9c676d (patch) | |
| tree | 0700b9ae14908d5f1c20368e0bb891ef57e4881a /mkspecs | |
| parent | c561c3b8b473d1b0f3557f8d8d89a7c37f847d5d (diff) | |
unify windows mkspecs: delete redundants in 5.10
mingw-w64 toolchain:
- remove 'QMAKE_CFLAGS_AESNI' and 'QMAKE_CFLAGS_SHANI' definitions,
which are already set in 'gcc-base.conf' toolchain; this is
a continuation of 77347a36 relating variables, introduced in 5.10,
- remove 'gcc-base.conf' duplicate inclusion, left after eef2d1af
was merged into 5.10.
Change-Id: I328def916ccfb93c3f6b8336eb8801defbac37ae
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 12f3567754..0a1cd2dd5a 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -31,8 +31,6 @@ QMAKE_CFLAGS += -fno-keep-inline-dllexport QMAKE_CFLAGS_WARN_ON += -Wextra QMAKE_CFLAGS_SSE2 += -mstackrealign -QMAKE_CFLAGS_AESNI = -maes -QMAKE_CFLAGS_SHANI = -msha QMAKE_CXX = $${CROSS_COMPILE}g++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS @@ -88,6 +86,5 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P include(../common/angle.conf) include(../common/windows-vulkan.conf) -include(../common/gcc-base.conf) load(qt_config) |