From: Erik Verbruggen <erik.verbruggen@digia.com>
Date: Mon, 27 Jul 2015 08:43:25 +0000 (+0200)
Subject: Conditionally define Q_ALWAYS_INLINE.
X-Git-Tag: v5.5.90+alpha1~135
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc67a157207a340593f0c5698c168ee766dab4f6;p=platform%2Fupstream%2Fqtdeclarative.git

Conditionally define Q_ALWAYS_INLINE.

Step one in moving it next to Q_NEVER_INLINE in qglobal_p.h.

Change-Id: Iedecf8de2531334cf3cf8cd5ae4c7b19f2d7736b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---

diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 30cdcaa..718bdbb 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -39,6 +39,7 @@
 #include "qv4global_p.h"
 #include <private/qv4heap_p.h>
 
+#ifndef Q_ALWAYS_INLINE
 #if defined(Q_CC_GNU)
 #  define Q_ALWAYS_INLINE inline __attribute__((always_inline))
 #elif defined(Q_CC_MSVC)
@@ -46,6 +47,7 @@
 #else
 #  define Q_ALWAYS_INLINE inline
 #endif
+#endif // Q_ALWAYS_INLINE
 
 QT_BEGIN_NAMESPACE