diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2015-07-27 10:43:25 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-07-29 09:49:24 +0000 |
| commit | fc67a157207a340593f0c5698c168ee766dab4f6 (patch) | |
| tree | 42a100ce0c1ca1786a3d8612d2d17073e8f3b6a0 /src/qml/jsruntime/qv4value_p.h | |
| parent | 0ea3c24cfe7d1057964fe864924a7ee083764084 (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime/qv4value_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 30cdcaa1cb..718bdbb620 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 |