diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-10-16 20:29:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-10-16 19:07:00 +0000 |
| commit | f63ad7c63bcb5ddc6acbee324897d2ff821c7c39 (patch) | |
| tree | 32118563fc7144a0de5306976d02c3e983c7a69b /src/qml/jsruntime/qv4sequenceobject.cpp | |
| parent | 5d084e1c94175e7805edd1e21e3c006bc1aa536c (diff) | |
Fix gcc6 build
Complete the patch for tautological-compare warnings after it was
merged form 5.6.
Task-number: QTBUG-56266
Change-Id: I39f25f429b90deb8d8830fb15f45ce29a5a4c51c
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
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 f3c1a88465..0f2acd6bbb 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -582,14 +582,11 @@ Heap::QQmlSequence<Container>::QQmlSequence(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; |