aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/memory
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-04-06 13:53:34 +0200
committerLars Knoll <lars.knoll@qt.io>2018-05-02 14:18:10 +0000
commite4a2b2885d1847624dcbc6b9e4dfdedf04767fe3 (patch)
treef6727f68c0ee36100eb429e0898a7c507439b62e /src/qml/memory
parentb58711804e9cca641927dbdebe281488e475352b (diff)
Add a StringOrSymbol intermediate class between Managed and String
This introduces a common base class for Strings and Symbols giving us a unified approach to handling object properties for both. Change-Id: Ic9e5a18b084c8b730e134db990f101d47af224e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory')
-rw-r--r--src/qml/memory/qv4heap_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h
index f327388355..316b89b829 100644
--- a/src/qml/memory/qv4heap_p.h
+++ b/src/qml/memory/qv4heap_p.h
@@ -75,7 +75,8 @@ struct VTable
uint isFunctionObject : 1;
uint isErrorObject : 1;
uint isArrayData : 1;
- uint unused : 18;
+ uint isStringOrSymbol : 1;
+ uint unused : 17;
uint type : 8;
const char *className;
void (*destroy)(Heap::Base *);