whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move minimal compiler version checks to qcompilerdetection.h 

Task-number: QTBUG-99313
Change-Id: Ia333ef8ee3c26f3511be7953e262aef3a0d7cc6c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Ivan Solovev 2022-07-07 12:12:43 +02:00
parent 8b029ef142
commit e5a7f021cd
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/global/qcompilerdetection.h
View File

@ -1180,4 +1180,27 @@
# undef QT_COMPILER_SUPPORTS_MIPS_DSPR2
#endif
// Compiler version check
#if defined(__cplusplus) && (__cplusplus < 201703L)
# ifdef Q_CC_MSVC
# error "Qt requires a C++17 compiler, and a suitable value for __cplusplus. On MSVC, you must pass the /Zc:__cplusplus option to the compiler."
# else
# error "Qt requires a C++17 compiler"
# endif
#endif // __cplusplus
#if defined(__cplusplus) && defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
# if Q_CC_MSVC < 1927
// Check below only works with 16.7 or newer
# error "Qt requires at least Visual Studio 2019 version 16.7 (VC++ version 14.27). Please upgrade."
# endif
// On MSVC we require /permissive- set by user code. Check that we are
// under its rules -- for instance, check that std::nullptr_t->bool is
// not an implicit conversion, as per
// https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=msvc-160#nullptr_t-is-only-convertible-to-bool-as-a-direct-initialization
static_assert(!std::is_convertible_v<std::nullptr_t, bool>,
"On MSVC you must pass the /permissive- option to the compiler.");
#endif
#endif // QCOMPILERDETECTION_H

24
src/corelib/global/qglobal.h
View File

@ -138,30 +138,6 @@
#include <QtCore/qprocessordetection.h>
#include <QtCore/qcompilerdetection.h>
// This could go to the very beginning of this file, but we're using compiler
// detection, so it's here.
#if defined(__cplusplus) && (__cplusplus < 201703L)
# ifdef Q_CC_MSVC
# error "Qt requires a C++17 compiler, and a suitable value for __cplusplus. On MSVC, you must pass the /Zc:__cplusplus option to the compiler."
# else
# error "Qt requires a C++17 compiler"
# endif
#endif // __cplusplus
#if defined(__cplusplus) && defined(Q_CC_MSVC) && !defined(Q_CC_CLANG)
# if Q_CC_MSVC < 1927
// Check below only works with 16.7 or newer
# error "Qt requires at least Visual Studio 2019 version 16.7 (VC++ version 14.27). Please upgrade."
# endif
// On MSVC we require /permissive- set by user code. Check that we are
// under its rules -- for instance, check that std::nullptr_t->bool is
// not an implicit conversion, as per
// https://docs.microsoft.com/en-us/cpp/overview/cpp-conformance-improvements?view=msvc-160#nullptr_t-is-only-convertible-to-bool-as-a-direct-initialization
static_assert(!std::is_convertible_v<std::nullptr_t, bool>,
"On MSVC you must pass the /permissive- option to the compiler.");
#endif
#if defined (__ELF__)
# define Q_OF_ELF
#endif