summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-05 13:32:35 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-05 13:37:21 +0100
commit53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch)
treee62c7d9875acab8094d64d137c90e7e5f53c0893 /mkspecs
parent2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff)
parent6508fdca1dcc7105947befadba272d0fd4bbc27f (diff)
downloadqtbase-53b141dcebc2ca423dbc31e5b6321a769155e9a4.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/msvc-desktop.conf12
-rw-r--r--mkspecs/win32-g++/qmake.conf2
-rw-r--r--mkspecs/win32-icc/qmake.conf9
-rw-r--r--mkspecs/win32-msvc/qmake.conf2
4 files changed, 15 insertions, 10 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index f7f7e54d26..20f594c601 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -1,10 +1,14 @@
#
-# qmake configuration for Microsoft Visual Studio C/C++ Compiler
-# This mkspec is used by the win32-msvc and win32-clang-msvc specs
+# This file is used as a basis for the following compilers:
#
-
+# - Microsoft C/C++ Optimizing Compiler (all desktop versions)
+# - Intel C++ Compiler on Windows
+# - Clang-cl
+#
+# Baseline:
+#
+# - Visual Studio 2005 (8.0), VC++ 14.0
#
-# Baseline: Visual Studio 2005 (8.0), VC++ 14.0
# Version-specific settings go in msvc-version.conf (loaded by default_pre)
#
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 884286ea30..36ec1c5c78 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for win32-g++
#
-# Written for MinGW / gcc 4.6 or higher
+# Written for MinGW-w64 / gcc 5.3 or higher
#
# Cross compile example for i686-w64-mingw32-g++:
# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 863fd77ea9..8c14a6609e 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -1,16 +1,17 @@
#
# qmake configuration for win32-icc
#
-# Written for Intel C++
+# Written for Intel C++ Compiler on Windows / icl 16.0 or higher
#
-# Use the Visual Studio configuration
+# Use the Microsoft (R) C/C++ Optimizing Compiler configuration,
+# since ICC on Windows pretends to be MSVC
include(../common/msvc-desktop.conf)
-# Now override with the Intel compiler settings
+# modifications to msvc-desktop.conf
-QMAKE_COMPILER += intel_icl # icl pretends to be msvc
+QMAKE_COMPILER += intel_icl
QMAKE_CC = icl
QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738,809,3373
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf
index 1d8b8f0e97..5c38330add 100644
--- a/mkspecs/win32-msvc/qmake.conf
+++ b/mkspecs/win32-msvc/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for win32-msvc
#
-# Written for Microsoft Visual C++ (all desktop versions)
+# Written for Microsoft C/C++ Optimizing Compiler (all desktop versions)
#
include(../common/msvc-desktop.conf)