diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-20 08:28:16 +0200 |
| commit | f5da1a9261d64fdac3b4e12082932cb473098c73 (patch) | |
| tree | bf96e4940ef4f66509589cc31095cf1d8e3b3a2c /src/qml/jsruntime/qv4sequenceobject.cpp | |
| parent | 0bfcff9d9bd20f3efef6146bd1da6f263b0e24c4 (diff) | |
| parent | dd313c4c5e383827913bbc106f9d19667f2dd149 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/quick/items/qquickitemsmodule.cpp
tests/auto/quick/rendernode/tst_rendernode.cpp
Change-Id: I90582df69feb95a4e4aafb0b9793c23714654f19
Diffstat (limited to 'src/qml/jsruntime/qv4sequenceobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 3eb7772db7..58da7b9f68 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -592,14 +592,11 @@ void Heap::QQmlSequence<Container>::init(QObject *object, int propertyIndex) namespace QV4 { typedef QQmlSequence<QVector<int> > QQmlIntVectorList; -template<> -DEFINE_OBJECT_VTABLE(QQmlIntVectorList); +DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlIntVectorList); typedef QQmlSequence<QVector<qreal> > QQmlRealVectorList; -template<> -DEFINE_OBJECT_VTABLE(QQmlRealVectorList); +DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlRealVectorList); typedef QQmlSequence<QVector<bool> > QQmlBoolVectorList; -template<> -DEFINE_OBJECT_VTABLE(QQmlBoolVectorList); +DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlBoolVectorList); typedef QQmlSequence<QStringList> QQmlQStringList; DEFINE_OBJECT_TEMPLATE_VTABLE(QQmlQStringList); typedef QQmlSequence<QList<QString> > QQmlStringList; |