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

4 files changed, 7 insertions, 54 deletions

diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp
index 566ee5651a..d839b381ef 100644
--- 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.cpp b/config.tests/common/c++98default/c++98default.cpp
deleted file mode 100644
index 3ff92eda33..0000000000
--- a/config.tests/common/c++98default/c++98default.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the configuration of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#if __cplusplus < 201103L
-#error "compiler does not use c++11 or higher by default"
-#endif
-
-int main(int, char **) {}
diff --git a/config.tests/common/c++98default/c++98default.pro b/config.tests/common/c++98default/c++98default.pro
deleted file mode 100644
index 97cf2d7b20..0000000000
--- a/config.tests/common/c++98default/c++98default.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = app
-CONFIG -= c++11 c++14 c++1z
-SOURCES = c++98default.cpp
diff --git a/config.tests/common/f16c/f16c.cpp b/config.tests/common/f16c/f16c.cpp
index fc73e4fc55..aeeb35eac3 100644
--- 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;
 }