diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-10 16:03:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-10 14:44:31 +0000 |
| commit | 8bf7cfb7880775f49dfbaf9a2be2202479eaaf99 (patch) | |
| tree | 635623f2fd35893b3299b09d1c5f75a120346bbb /src/3rdparty | |
| parent | 86a55cdb8cb850066e1dcc288d2dddf600652994 (diff) | |
Fix qmldevtools for QML compiler
Re-add some run-time functions in the qmldevtools and replace the use of the WTF
assert that pulls in some wtf functions with a Q_ASSERT.
Change-Id: Id7b4bdb02c54e8b498db3fab78870463fa4fac9a
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/wtf/StdLibExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/StdLibExtras.h b/src/3rdparty/masm/wtf/StdLibExtras.h index 605f98ec82..f0d792ed52 100644 --- a/src/3rdparty/masm/wtf/StdLibExtras.h +++ b/src/3rdparty/masm/wtf/StdLibExtras.h @@ -166,7 +166,7 @@ template<typename T> char (&ArrayLengthHelperFunction(T (&)[0]))[0]; // Efficient implementation that takes advantage of powers of two. inline size_t roundUpToMultipleOf(size_t divisor, size_t x) { - ASSERT(divisor && !(divisor & (divisor - 1))); + Q_ASSERT(divisor && !(divisor & (divisor - 1))); size_t remainderMask = divisor - 1; return (x + remainderMask) & ~remainderMask; } |