summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++/qmake.conf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-19 09:48:10 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-19 09:48:10 +0100
commit739585b2f5684956d9c5b999300b4b7b2cd0daa3 (patch)
treec785232d461328db1a2a8e85748e75e402ed8a08 /mkspecs/win32-g++/qmake.conf
parent0ffc39806e4669eaebe2d20d197b3a6f356be862 (diff)
parent13f6eb9773c0a4c64da7070be4ac3bbf66f8c82d (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
Diffstat (limited to 'mkspecs/win32-g++/qmake.conf')
-rw-r--r--mkspecs/win32-g++/qmake.conf9
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index d728047765..12f3567754 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -16,8 +16,11 @@ include(../common/g++-base.conf)
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32 mingw
CONFIG += debug_and_release debug_and_release_target precompile_header
-DEFINES += UNICODE _UNICODE
-QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
+DEFINES += UNICODE _UNICODE WIN32
+QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32
+# can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for
+# x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC,
+# 'QMAKE_TARGET.arch' is inherently unavailable.
QMAKE_CC = $${CROSS_COMPILE}gcc
QMAKE_LEX = flex
@@ -32,6 +35,8 @@ QMAKE_CFLAGS_AESNI = -maes
QMAKE_CFLAGS_SHANI = -msha
QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_RTTI_ON = -frtti
QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads