Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev

5 files changed, 110 insertions, 35 deletions

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 7c31df4d6a..e1ca8828f9 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -73,6 +73,7 @@ linux:!static {
     } else {
         SOURCES += global/minimum-linux.S
     }
+    HEADERS += global/minimum-linux_p.h
 }
 
 qtConfig(slog2): \
diff --git a/src/corelib/global/minimum-linux.S b/src/corelib/global/minimum-linux.S
index c3261288c2..dfc3cec1be 100644
--- a/src/corelib/global/minimum-linux.S
+++ b/src/corelib/global/minimum-linux.S
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "private/qglobal_p.h"
+#include "minimum-linux_p.h"
 
 /* Copied from #include <elf.h>:
  */
@@ -76,32 +76,6 @@
 /* Operating systems: */
     .long       ELF_NOTE_OS_LINUX
 
-/* Minimum Linux kernel version:
- * We require the following features in Qt (unconditional, no fallback):
- *   Feature                    Added in version        Macro
- * - inotify_init1              before 2.6.12-rc12
- * - futex(2)                   before 2.6.12-rc12
- * - FUTEX_WAKE_OP              2.6.14                  FUTEX_OP
- * - linkat(2)                  2.6.17                  O_TMPFILE
- * - FUTEX_PRIVATE_FLAG         2.6.22
- * - O_CLOEXEC                  2.6.23
- * - eventfd                    2.6.23
- * - pipe2 & dup3               2.6.27
- * - accept4                    2.6.28
- * - renameat2                  3.16                    QT_CONFIG(renameat2)
- * - getrandom                  3.17                    QT_CONFIG(getentropy)
- */
-
-#if QT_CONFIG(getentropy)
-    .long       3
-    .long       17
-    .long       0
-#elif QT_CONFIG(renameat2)
-    .long       3
-    .long       16
-    .long       0
-#else
-    .long       2
-    .long       6
-    .long       28
-#endif
+    .long       MINLINUX_MAJOR
+    .long       MINLINUX_MINOR
+    .long       MINLINUX_PATCH
diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h
new file mode 100644
index 0000000000..324744b856
--- /dev/null
+++ b/src/corelib/global/minimum-linux_p.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module 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$
+**
+****************************************************************************/
+
+#ifndef MINIMUMLINUX_P_H
+#define MINIMUMLINUX_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// EXTRA WARNING
+// -------------
+//
+// This file must also be valid assembler source.
+//
+
+#include "private/qglobal_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/* Minimum Linux kernel version:
+ * We require the following features in Qt (unconditional, no fallback):
+ *   Feature                    Added in version        Macro
+ * - inotify_init1              before 2.6.12-rc12
+ * - futex(2)                   before 2.6.12-rc12
+ * - FUTEX_WAKE_OP              2.6.14                  FUTEX_OP
+ * - linkat(2)                  2.6.17                  O_TMPFILE
+ * - FUTEX_PRIVATE_FLAG         2.6.22
+ * - O_CLOEXEC                  2.6.23
+ * - eventfd                    2.6.23
+ * - pipe2 & dup3               2.6.27
+ * - accept4                    2.6.28
+ * - renameat2                  3.16                    QT_CONFIG(renameat2)
+ * - getrandom                  3.17                    QT_CONFIG(getentropy)
+ */
+
+#if QT_CONFIG(getentropy)
+#  define MINLINUX_MAJOR        3
+#  define MINLINUX_MINOR        17
+#  define MINLINUX_PATCH        0
+#elif QT_CONFIG(renameat2)
+#  define MINLINUX_MAJOR        3
+#  define MINLINUX_MINOR        16
+#  define MINLINUX_PATCH        0
+#else
+#  define MINLINUX_MAJOR        2
+#  define MINLINUX_MINOR        6
+#  define MINLINUX_PATCH        28
+#endif
+
+#define MINIMUM_LINUX_VERSION  QT_VERSION_CHECK(MINLINUX_MAJOR, MINLINUX_MINOR, MINLINUX_PATCH)
+
+QT_END_NAMESPACE
+
+#endif // MINIMUMLINUX_P_H
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index 89a62a93db..10598adb1d 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -167,7 +167,8 @@ inline qfloat16 operator/(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat
     inline FP operator OP(qfloat16 lhs, FP rhs) Q_DECL_NOTHROW { return static_cast<FP>(lhs) OP rhs; } \
     inline FP operator OP(FP lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<FP>(rhs); }
 #define QF16_MAKE_ARITH_OP_EQ_FP(FP, OP_EQ, OP) \
-    inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) Q_DECL_NOTHROW { lhs = qfloat16(static_cast<FP>(lhs) OP rhs); return lhs; }
+    inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) Q_DECL_NOTHROW \
+    { lhs = qfloat16(float(static_cast<FP>(lhs) OP rhs)); return lhs; }
 #define QF16_MAKE_ARITH_OP(FP) \
     QF16_MAKE_ARITH_OP_FP(FP, +) \
     QF16_MAKE_ARITH_OP_FP(FP, -) \
diff --git a/src/corelib/global/qrandom.h b/src/corelib/global/qrandom.h
index 2259f2657a..049495d4e8 100644
--- a/src/corelib/global/qrandom.h
+++ b/src/corelib/global/qrandom.h
@@ -51,9 +51,12 @@ class QRandomGenerator
     template <typename UInt> using IfValidUInt =
         typename std::enable_if<std::is_unsigned<UInt>::value && sizeof(UInt) >= sizeof(uint), bool>::type;
 public:
+    static QRandomGenerator system() { return {}; }
+    static QRandomGenerator global() { return {}; }
     QRandomGenerator() = default;
 
     // ### REMOVE BEFORE 5.10
+    QRandomGenerator *operator->() { return this; }
     static quint32 get32() { return generate(); }
     static quint64 get64() { return generate64(); }
     static qreal getReal() { return generateDouble(); }
@@ -135,13 +138,14 @@ public:
     static Q_DECL_CONSTEXPR result_type max() { return (std::numeric_limits<result_type>::max)(); }
 
 private:
-    Q_DISABLE_COPY(QRandomGenerator)
     static Q_CORE_EXPORT void fillRange_helper(void *buffer, void *bufferEnd);
 };
 
 class QRandomGenerator64
 {
 public:
+    static QRandomGenerator64 system() { return {}; }
+    static QRandomGenerator64 global() { return {}; }
     QRandomGenerator64() = default;
 
     static quint64 generate() { return QRandomGenerator::generate64(); }
@@ -152,9 +156,6 @@ public:
     double entropy() const Q_DECL_NOTHROW { return 0.0; }
     static Q_DECL_CONSTEXPR result_type min() { return (std::numeric_limits<result_type>::min)(); }
     static Q_DECL_CONSTEXPR result_type max() { return (std::numeric_limits<result_type>::max)(); }
-
-private:
-    Q_DISABLE_COPY(QRandomGenerator64)
 };