diff options
| author | Andrew Knight <andrew.knight@intopalo.com> | 2015-03-09 22:55:23 +0200 |
|---|---|---|
| committer | Andrew Knight <qt@panimo.net> | 2015-03-10 06:48:09 +0000 |
| commit | 7e590cc0aab2825f90b6fa833ef9ab325653d32d (patch) | |
| tree | e68e11dac955fec06cd2f1742238cf03846766aa | |
| parent | d988310434b00cc0e159fdf6ff3f586eefc47eed (diff) | |
Fix clang warning
Removes "warning: first declaration of static data member specialization
of 'static_vtbl' outside namespace 'QV4' is a C++11 extension" by
placing the declarations inside the QV4 namespace.
Change-Id: I9a31874430900a200e83c42ff6c1afc36f0431e1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 7853b5fac6..a7e3b22cd2 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -527,6 +527,8 @@ Heap::QQmlSequence<Container>::QQmlSequence(QV4::ExecutionEngine *engine, QObjec } +namespace QV4 { + typedef QQmlSequence<QStringList> QQmlQStringList; template<> DEFINE_OBJECT_VTABLE(QQmlQStringList); @@ -546,6 +548,8 @@ typedef QQmlSequence<QList<qreal> > QQmlRealList; template<> DEFINE_OBJECT_VTABLE(QQmlRealList); +} + #define REGISTER_QML_SEQUENCE_METATYPE(unused, unused2, SequenceType, unused3) qRegisterMetaType<SequenceType>(#SequenceType); void SequencePrototype::init() { |