From 8bf7cfb7880775f49dfbaf9a2be2202479eaaf99 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 10 Aug 2016 16:03:03 +0200 Subject: 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 --- src/3rdparty/masm/wtf/StdLibExtras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') 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 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; } -- cgit v1.2.3