Merge remote-tracking branch 'origin/5.9' into dev

Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775
xiers · Apr 7, 2017 · 5d6073b · 5d6073b
2 parents 97d7d80 + bbb67ca
commit 5d6073b
Show file tree

Hide file tree

Showing 175 changed files with 1,557 additions and 1,964 deletions.
diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp
@@ -39,6 +39,9 @@
 
 #include <alloca.h>
 
+// extra include needed in QNX7 to define NULL for the alloca() macro
+#include <stdlib.h>
+
 int main(int, char **)
 {
     alloca(1);

diff --git a/config.tests/common/c++98default/c++98default.pro b/config.tests/common/c++98default/c++98default.pro
diff --git a/config.tests/common/f16c/f16c.cpp b/config.tests/common/f16c/f16c.cpp
@@ -41,14 +41,11 @@
 
 int main(int, char**)
 {
-    float f = 1.f;
-    unsigned short s = _cvtss_sh(f, 0);
-    float g = _cvtsh_ss(s);
-    bool result = f == g;
-    (void)result;
     __m128i a = _mm_setzero_si128();
-    __m256 b = _mm256_cvtph_ps(a);
-    __m128i c = _mm256_cvtps_ph(b, 0);
+    __m128 b = _mm_cvtph_ps(a);
+    __m256 b256 = _mm256_cvtph_ps(a);
+    __m128i c = _mm_cvtps_ph(b, 0);
+    c = _mm256_cvtps_ph(b256, 0);
     (void)c;
     return 0;
 }
diff --git a/configure.json b/configure.json
@@ -247,11 +247,6 @@
             "type": "compile",
             "test": "common/c++1z"
         },
-        "cxx11default": {
-            "label": "compiler defaulting to C++11 or higher",
-            "type": "compile",
-            "test": "common/c++98default"
-        },
         "precompile_header": {
             "label": "precompiled header support",
             "type": "compile",
@@ -479,11 +474,6 @@
             "condition": "call.crossCompile",
             "output": [ "publicConfig", "privateConfig", "publicFeature", "crossCompile" ]
         },
-        "cxx11default": {
-            "label": "Compiler defaults to C++11 or higher",
-            "condition": "!tests.cxx11default",
-            "output": [ { "type": "publicConfig", "name": "c++11" } ]
-        },
         "compiler-flags": {
             "output": [ "compilerFlags" ]
         },

diff --git a/mkspecs/common/ghs-integrity-armv7.conf b/mkspecs/common/ghs-integrity-armv7.conf
@@ -7,6 +7,8 @@ QMAKE_PLATFORM          = integrity
 
 include(unix.conf)
 
+QMAKE_CFLAGS           += -bigswitch
+
 include(ghs-base.conf)
 
 QMAKE_CC                = cxintarm -bsp $$(INTEGRITY_BSP) -os_dir $$(INTEGRITY_DIR) -non_shared

diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
@@ -49,6 +49,8 @@ greaterThan(QMAKE_MSC_VER, 1799) {
     QMAKE_CFLAGS       += -FS
     QMAKE_CXXFLAGS     += -FS
 
+    QMAKE_CFLAGS_F16C   = -arch:AVX
+
     equals(QMAKE_MSC_VER, 1800) {
         QMAKE_CFLAGS_RELEASE += -Zc:strictStrings
         QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -Zc:strictStrings

diff --git a/mkspecs/features/data/macros.cpp b/mkspecs/features/data/macros.cpp
@@ -1,4 +1,5 @@
 // Keep this file small. The pre-processed contents are eval'd by qmake.
+QT_COMPILER_STDCXX = __cplusplus
 #ifdef _MSC_VER
 QMAKE_MSC_VER = _MSC_VER
 QMAKE_MSC_FULL_VER = _MSC_FULL_VER

diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
@@ -100,6 +100,11 @@ breakpad {
     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
 }
 
+!c++11:!c++14:!c++1z {
+    # Qt requires C++11 since 5.7, check if we need to force a compiler option
+    QT_COMPILER_STDCXX_no_L = $$replace(QT_COMPILER_STDCXX, "L$", "")
+    !greaterThan(QT_COMPILER_STDCXX_no_L, 199711): CONFIG += c++11
+}
 c++11|c++14|c++1z {
     # Disable special compiler flags for host builds
     !host_build|!cross_compile {

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
@@ -137,6 +137,7 @@ unset(target_prefix)
 
 # Populate QMAKE_COMPILER_DEFINES and some compatibility variables.
 # The $$format_number() calls strip leading zeros to avoid misinterpretation as octal.
+QMAKE_COMPILER_DEFINES += __cplusplus=$$QT_COMPILER_STDCXX
 !isEmpty(QMAKE_MSC_VER) {
     QMAKE_COMPILER_DEFINES += _MSC_VER=$$QMAKE_MSC_VER _MSC_FULL_VER=$$QMAKE_MSC_FULL_VER
     QT_MSVC_MAJOR_VERSION = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", "\\1")

diff --git a/mkspecs/linux-aarch64-gnu-g++/qmake.conf b/mkspecs/linux-aarch64-gnu-g++/qmake.conf
@@ -0,0 +1,24 @@
+#
+# qmake configuration for building with aarch64-linux-gnu-g++
+#
+
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += incremental
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+# modifications to g++.conf
+QMAKE_CC                = aarch64-linux-gnu-gcc
+QMAKE_CXX               = aarch64-linux-gnu-g++
+QMAKE_LINK              = aarch64-linux-gnu-g++
+QMAKE_LINK_SHLIB        = aarch64-linux-gnu-g++
+
+# modifications to linux.conf
+QMAKE_AR                = aarch64-linux-gnu-ar cqs
+QMAKE_OBJCOPY           = aarch64-linux-gnu-objcopy
+QMAKE_NM                = aarch64-linux-gnu-nm -P
+QMAKE_STRIP             = aarch64-linux-gnu-strip
+load(qt_config)
diff --git a/...ests/common/c++98default/c++98default.cpp → ...ecs/linux-aarch64-gnu-g++/qplatformdefs.h b/...ests/common/c++98default/c++98default.cpp → ...ecs/linux-aarch64-gnu-g++/qplatformdefs.h
@@ -1,9 +1,9 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the configuration of the Qt Toolkit.
+** This file is part of the qmake spec of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -37,8 +37,4 @@
 **
 ****************************************************************************/
 
-#if __cplusplus < 201103L
-#error "compiler does not use c++11 or higher by default"
-#endif
-
-int main(int, char **) {}
+#include "../linux-g++/qplatformdefs.h"
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
@@ -42,6 +42,7 @@ QMAKE_CFLAGS_AVX512PF  += -xMIC-AVX512
 QMAKE_CFLAGS_AVX512DQ  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512BW  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512VL  += -xCORE-AVX512
+QMAKE_CFLAGS_F16C      += $$QMAKE_CFLAGS_AVX2
 QMAKE_CFLAGS_AESNI     += -maes
 QMAKE_CFLAGS_SHANI     += -msha
 

diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
@@ -40,6 +40,7 @@ QMAKE_CFLAGS_AVX512PF  += -xMIC-AVX512
 QMAKE_CFLAGS_AVX512DQ  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512BW  += -xCORE-AVX512
 QMAKE_CFLAGS_AVX512VL  += -xCORE-AVX512
+QMAKE_CFLAGS_F16C      += $$QMAKE_CFLAGS_AVX2
 QMAKE_CFLAGS_AESNI     += -maes
 QMAKE_CFLAGS_SHANI     += -msha
 

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
@@ -33,6 +33,7 @@ QMAKE_CFLAGS_AVX512PF  += -QxMIC-AVX512
 QMAKE_CFLAGS_AVX512DQ  += -QxCORE-AVX512
 QMAKE_CFLAGS_AVX512BW  += -QxCORE-AVX512
 QMAKE_CFLAGS_AVX512VL  += -QxCORE-AVX512
+QMAKE_CFLAGS_F16C       = $$QMAKE_CFLAGS_AVX2
 QMAKE_CFLAGS_AESNI      = -QxSSE2
 QMAKE_CFLAGS_SHANI      = -QxSSE4.2
 

diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
@@ -2883,6 +2883,11 @@
     MY_VAR2 will contain '-Lone -Ltwo -Lthree -Lfour -Lfive', and MY_VAR3 will
     contain 'three two three'.
 
+    \section2 files(pattern[, recursive=false])
+
+    Expands the specified wildcard pattern and returns a list of filenames.
+    If \c recursive is true, this function descends into subdirectories.
+
     \target fn_first
     \section2 first(variablename)
 
@@ -3376,11 +3381,6 @@
     Exports the current value of \c variablename from the local context of a
     function to the global context.
 
-    \section2 files(pattern[, recursive=false])
-
-    Expands the specified wildcard pattern and returns a list of filenames.
-    If \c recursive is true, this function descends into subdirectories.
-
     \target forfunction
     \section2 for(iterate, list)