From 77347a3699f8f236e1d440fb514ff8225ed5971b Mon Sep 17 00:00:00 2001 From: Alexander Shevchenko Date: Tue, 19 Dec 2017 11:20:07 +0200 Subject: [PATCH] unify windows mkspecs: delete redundants mingw-w64 toolchain: - remove 'QMAKE_CXXFLAGS_THREAD' variable definition, since 'QMAKE_CFLAGS_THREAD' variable not set for mingw-w64 toolchain. ICC on Windows toolchain: - remove 'QMAKE_LFLAGS', 'QMAKE_LFLAGS_RELEASE', 'QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO' and 'QMAKE_LFLAGS_DEBUG' definitions, since they're properly set in 'msvc-desktop.conf', - remove 'DSP_EXTENSION' variable, which doesn't occur anywhere else within QtBase; its most recent search results relate to Visual Studio 6.0 and Intel Fortran. Change-Id: I2ce5c2c9e9ca2c09c1acfcf8c60381d318e8e380 Reviewed-by: Oswald Buddenhagen --- mkspecs/win32-g++/qmake.conf | 1 - mkspecs/win32-icc/qmake.conf | 6 ------ 2 files changed, 7 deletions(-) diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index cf43797b95d..39ecf005444 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -30,7 +30,6 @@ QMAKE_CFLAGS_WARN_ON += -Wextra QMAKE_CFLAGS_SSE2 += -mstackrealign QMAKE_CXX = $${CROSS_COMPILE}g++ -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_CXXFLAGS_RTTI_ON = -frtti QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index a25c979d9af..9506097e7f3 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -48,16 +48,10 @@ QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG QMAKE_LINK = xilink -QMAKE_LFLAGS = /NOLOGO -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = -QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_LIB = xilib /NOLOGO -DSP_EXTENSION = .dsp - include(../common/angle.conf) load(qt_config)