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 30cdcaa1cb8a1af6ff5347b5ac6bc7a71ddde65e..718bdbb620a6a504e863599b83477595d158a38d 100644 (file)
--- 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