diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2022-07-27 10:20:39 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-03 15:59:06 +0000 |
| commit | 51acd4708296de4392232271b3d6c5d067bdffad (patch) | |
| tree | 3ca99f5ca60e55788a24e377aa0827e8d0bae5f8 /src/corelib/kernel/qobject.cpp | |
| parent | 870cfa4e17c42698b77504cfc19728acfbf7d659 (diff) | |
Disable constinit for MSVC compilers
https://developercommunity.visualstudio.com/t/C:-constinit-for-an-optional-fails-if-/1406069
does not only affect constinit thread_local but also constinit in
general on MSVC compilers when C++20 is being used. So disable the
feature for these compilers in general for now.
This commit amends d9531593a248e19f7da7862b2870a6af2f413e75
Fixes: QTBUG-105234
Pick-to: 6.4
Change-Id: I1855f0857d85487895460fc7c56675fb864bfa73
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index e07631d0015..a7f48b5c598 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2415,7 +2415,7 @@ public: { return std::find(locations.begin(), locations.end(), method) != locations.end(); } }; -Q_THREAD_LOCAL_CONSTINIT static thread_local FlaggedDebugSignatures flaggedSignatures = {}; +Q_CONSTINIT static thread_local FlaggedDebugSignatures flaggedSignatures = {}; } // unnamed namespace const char *qFlagLocation(const char *method) |