diff options
| author | Oleg Shparber <trollixx@gmail.com> | 2014-11-20 22:16:53 -0800 |
|---|---|---|
| committer | Oleg Shparber <trollixx@gmail.com> | 2014-11-21 19:19:19 +0100 |
| commit | 2cb6d1bf32e017026f618dcfdbef3980f5363656 (patch) | |
| tree | e2429bfd2b5030aab2e3c33e74f6158cbccab7e9 /src/qml/qml/v8/qv8engine.cpp | |
| parent | d6140dbfe8ee700c20c1bb9811b4d15a30a83767 (diff) | |
Make QV4::RegExpObject header independent from masm headers
Also remove pointless uint32_t for uint values and replace
a few inconsistent uint16_t uses with quint16. MSVC was using uintN_t
defined in masm headers instead of cstdint, so this change eliminates
such situation.
Change-Id: Ibd7dd50fc047dcdc78e057299883311a24dd3960
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 41ef719c64..e08f2c494f 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -199,9 +199,9 @@ QVariant QV8Engine::toVariant(const QV4::ValueRef value, int typeHint, bool crea QV4::ScopedArrayObject a(scope, value); if (typeHint == qMetaTypeId<QList<QObject *> >()) { QList<QObject *> list; - uint32_t length = a->getLength(); + uint length = a->getLength(); QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope); - for (uint32_t ii = 0; ii < length; ++ii) { + for (uint ii = 0; ii < length; ++ii) { qobjectWrapper = a->getIndexed(ii); if (!!qobjectWrapper) { list << qobjectWrapper->object(); |