Skip to content

Commit

Permalink
QMutex: Work around ICC bug in dealing with constexpr constructor
Browse files Browse the repository at this point in the history
The bug report says it also happens in some MSVC builds, but no one has
so far been able to reproduce it or give us a log with more details, so
not working around the issue for MSVC. ICC, howevere, is known to have a
lot of parsing issues, so I'm not surprised and don't feel a problem
working around them.

This fix is not applicable for Qt 6.

Fixes: QTBUG-85644
Change-Id: If51855da004b4f3fbf43fffd1649b64e05cb91cc
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
  • Loading branch information
thiagomacieira committed Nov 22, 2020
1 parent 7d0d7da commit b00fc46
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/corelib/thread/qmutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class Q_CORE_EXPORT QBasicMutex
class Q_CORE_EXPORT QMutex : public QBasicMutex
{
public:
#if defined(Q_COMPILER_CONSTEXPR)
#if defined(Q_COMPILER_CONSTEXPR) && !defined(Q_CC_INTEL)
constexpr QMutex() = default;
#else
QMutex() { d_ptr.storeRelaxed(nullptr); }
Expand Down

0 comments on commit b00fc46

Please sign in to comment.