summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qcompilerdetection.h2
-rw-r--r--src/corelib/global/qglobal.cpp5
-rw-r--r--src/corelib/global/qglobalstatic.qdoc32
-rw-r--r--src/corelib/global/qoperatingsystemversion.cpp8
-rw-r--r--src/corelib/global/qoperatingsystemversion.h1
-rw-r--r--src/corelib/global/qoperatingsystemversion_win.cpp2
-rw-r--r--src/corelib/global/qsystemdetection.h79
7 files changed, 34 insertions, 95 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 87ade23503..9906425f5b 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -629,7 +629,7 @@
# define Q_COMPILER_THREAD_LOCAL
# define Q_COMPILER_UDL
# endif
-# elif defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L s
+# elif defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L
// C11 features supported. Only tested with ICC 17 and up.
# define Q_COMPILER_STATIC_ASSERT
# if __has_include(<threads.h>)
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index b654f5863a..3fe91cae65 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1038,6 +1038,11 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
\snippet code/src_corelib_global_qglobal.cpp 53
+ \note Qt detects the necessary C++14 compiler support by way of the feature
+ test recommendations from
+ \l{https://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations}
+ {C++ Committee's Standing Document 6}.
+
\sa qConstOverload(), qNonConstOverload(), {Differences between String-Based
and Functor-Based Connections}
*/
diff --git a/src/corelib/global/qglobalstatic.qdoc b/src/corelib/global/qglobalstatic.qdoc
index 63cc968d1c..303709bb1d 100644
--- a/src/corelib/global/qglobalstatic.qdoc
+++ b/src/corelib/global/qglobalstatic.qdoc
@@ -3,9 +3,9 @@
** Copyright (C) 2016 Intel Corporation.
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
@@ -14,25 +14,13 @@
** 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.
-**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -336,7 +324,7 @@
\threadsafe
\inmodule QtCore
\since 5.1
- \brief The QGlobalStatic class is used to implement a global static object
+ \brief The QGlobalStatic class is used to implement a global static object.
The QGlobalStatic class is the front-end API exported when
Q_GLOBAL_STATIC() is used. See the documentation for the macro for a
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp
index 4d267e328d..2f8d339ca7 100644
--- a/src/corelib/global/qoperatingsystemversion.cpp
+++ b/src/corelib/global/qoperatingsystemversion.cpp
@@ -438,6 +438,14 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSHighSierra =
QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 13);
/*!
+ \variable QOperatingSystemVersion::MacOSMojave
+ \brief a version corresponding to macOS Mojave (version 10.14).
+ \since 5.11.2
+ */
+const QOperatingSystemVersion QOperatingSystemVersion::MacOSMojave =
+ QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 14);
+
+/*!
\variable QOperatingSystemVersion::AndroidJellyBean
\brief a version corresponding to Android Jelly Bean (version 4.1, API level 16).
\since 5.9
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h
index 5f27deab9e..df01e5438a 100644
--- a/src/corelib/global/qoperatingsystemversion.h
+++ b/src/corelib/global/qoperatingsystemversion.h
@@ -70,6 +70,7 @@ public:
static const QOperatingSystemVersion OSXElCapitan;
static const QOperatingSystemVersion MacOSSierra;
static const QOperatingSystemVersion MacOSHighSierra;
+ static const QOperatingSystemVersion MacOSMojave;
static const QOperatingSystemVersion AndroidJellyBean;
static const QOperatingSystemVersion AndroidJellyBean_MR1;
diff --git a/src/corelib/global/qoperatingsystemversion_win.cpp b/src/corelib/global/qoperatingsystemversion_win.cpp
index f3662ae1f9..7659fb2550 100644
--- a/src/corelib/global/qoperatingsystemversion_win.cpp
+++ b/src/corelib/global/qoperatingsystemversion_win.cpp
@@ -97,7 +97,7 @@ static inline OSVERSIONINFOEX determineWinOsVersion()
// because linking to it at load time will not pass the Windows App Certification Kit
// https://msdn.microsoft.com/en-us/library/windows/hardware/ff561910.aspx
RtlGetVersionFunction pRtlGetVersion = reinterpret_cast<RtlGetVersionFunction>(
- GetProcAddressA(ntdll, "RtlGetVersion"));
+ reinterpret_cast<QFunctionPointer>(GetProcAddressA(ntdll, "RtlGetVersion")));
if (Q_UNLIKELY(!pRtlGetVersion))
return result;
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index ff0e03108b..cacb95b674 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -216,18 +216,6 @@
# // Numerical checks are preferred to named checks, but to be safe
# // we define the missing version names in case Qt uses them.
#
-# if !defined(__MAC_10_7)
-# define __MAC_10_7 1070
-# endif
-# if !defined(__MAC_10_8)
-# define __MAC_10_8 1080
-# endif
-# if !defined(__MAC_10_9)
-# define __MAC_10_9 1090
-# endif
-# if !defined(__MAC_10_10)
-# define __MAC_10_10 101000
-# endif
# if !defined(__MAC_10_11)
# define __MAC_10_11 101100
# endif
@@ -237,17 +225,8 @@
# if !defined(__MAC_10_13)
# define __MAC_10_13 101300
# endif
-# if !defined(MAC_OS_X_VERSION_10_7)
-# define MAC_OS_X_VERSION_10_7 1070
-# endif
-# if !defined(MAC_OS_X_VERSION_10_8)
-# define MAC_OS_X_VERSION_10_8 1080
-# endif
-# if !defined(MAC_OS_X_VERSION_10_9)
-# define MAC_OS_X_VERSION_10_9 1090
-# endif
-# if !defined(MAC_OS_X_VERSION_10_10)
-# define MAC_OS_X_VERSION_10_10 101000
+# if !defined(__MAC_10_14)
+# define __MAC_10_14 101400
# endif
# if !defined(MAC_OS_X_VERSION_10_11)
# define MAC_OS_X_VERSION_10_11 101100
@@ -258,55 +237,10 @@
# if !defined(MAC_OS_X_VERSION_10_13)
# define MAC_OS_X_VERSION_10_13 101300
# endif
-#
-# if !defined(__IPHONE_4_3)
-# define __IPHONE_4_3 40300
-# endif
-# if !defined(__IPHONE_5_0)
-# define __IPHONE_5_0 50000
-# endif
-# if !defined(__IPHONE_5_1)
-# define __IPHONE_5_1 50100
-# endif
-# if !defined(__IPHONE_6_0)
-# define __IPHONE_6_0 60000
-# endif
-# if !defined(__IPHONE_6_1)
-# define __IPHONE_6_1 60100
-# endif
-# if !defined(__IPHONE_7_0)
-# define __IPHONE_7_0 70000
-# endif
-# if !defined(__IPHONE_7_1)
-# define __IPHONE_7_1 70100
-# endif
-# if !defined(__IPHONE_8_0)
-# define __IPHONE_8_0 80000
-# endif
-# if !defined(__IPHONE_8_1)
-# define __IPHONE_8_1 80100
-# endif
-# if !defined(__IPHONE_8_2)
-# define __IPHONE_8_2 80200
-# endif
-# if !defined(__IPHONE_8_3)
-# define __IPHONE_8_3 80300
-# endif
-# if !defined(__IPHONE_8_4)
-# define __IPHONE_8_4 80400
-# endif
-# if !defined(__IPHONE_9_0)
-# define __IPHONE_9_0 90000
-# endif
-# if !defined(__IPHONE_9_1)
-# define __IPHONE_9_1 90100
-# endif
-# if !defined(__IPHONE_9_2)
-# define __IPHONE_9_2 90200
-# endif
-# if !defined(__IPHONE_9_3)
-# define __IPHONE_9_3 90300
+# if !defined(MAC_OS_X_VERSION_10_14)
+# define MAC_OS_X_VERSION_10_14 101400
# endif
+#
# if !defined(__IPHONE_10_0)
# define __IPHONE_10_0 100000
# endif
@@ -322,6 +256,9 @@
# if !defined(__IPHONE_11_0)
# define __IPHONE_11_0 110000
# endif
+# if !defined(__IPHONE_12_0)
+# define __IPHONE_12_0 120000
+# endif
#endif
#ifdef __LSB_VERSION__
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 03:39:34 +0000