diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-26 12:56:18 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-05-11 23:24:00 +0000 |
| commit | 6bed1d55b38effa5ccee69423c104dfad374b484 (patch) | |
| tree | 80196a97e92ba4ba74649005d6aa0f14e24a1139 /src | |
| parent | 74f75a3a120b07bbfe6904512b338db8850874e4 (diff) | |
Remove workaround for the pointer size in bootstrapped tool builds
The pointer size is now correctly set in qprocessordetection.h even for
bootstrapped builds.
Change-Id: I7e6338336dd6468ead24ffff1410d4ba8b1cbdad
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 723afcab54..6bd39355c5 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -50,11 +50,7 @@ #include "qv4global_p.h" #include <private/qv4heap_p.h> -/* We cannot rely on QT_POINTER_SIZE to be set correctly on host builds. In qmldevtools the Value objects - are only used to store primitives, never object pointers. So we can use the 64-bit encoding. */ -#ifdef V4_BOOTSTRAP -#define QV4_USE_64_BIT_VALUE_ENCODING -#elif QT_POINTER_SIZE == 8 +#if QT_POINTER_SIZE == 8 #define QV4_USE_64_BIT_VALUE_ENCODING #endif |