From f12d7eb1d0b97a9b068ca8da9cc1bed04db9a518 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 1 Apr 2013 11:14:48 -0700 Subject: Stabilize Code Apparently it is no longer necessary to rely on undefined compiler behavior. Change-Id: I8e93dc0de663713c714d7894f4c66acb0aec30b4 Reviewed-by: Matthew Vogt Reviewed-by: Alan Alpert --- src/qml/qml/qqmlcompiler.cpp | 2 +- src/qml/qml/qqmlpropertycache.cpp | 2 +- src/qml/qml/v8/qv8engine.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qml/qml/qqmlcompiler.cpp b/src/qml/qml/qqmlcompiler.cpp index a5f1cc564f..6951c8c387 100644 --- a/src/qml/qml/qqmlcompiler.cpp +++ b/src/qml/qml/qqmlcompiler.cpp @@ -2527,7 +2527,7 @@ bool QQmlCompiler::buildPropertyLiteralAssignment(QQmlScript::Property *prop, struct StaticQtMetaObject : public QObject { static const QMetaObject *get() - { return &static_cast (0)->staticQtMetaObject; } + { return &staticQtMetaObject; } }; bool QQmlCompiler::testQualifiedEnumAssignment(QQmlScript::Property *prop, diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index e1aa310e3e..b1ffc9a2d5 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1055,7 +1055,7 @@ QStringList QQmlPropertyCache::propertyNames() const struct StaticQtMetaObject : public QObject { static const QMetaObject *get() - { return &static_cast (0)->staticQtMetaObject; } + { return &staticQtMetaObject; } }; static int EnumType(const QMetaObject *metaobj, const QByteArray &str, int type) diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 2f14b62618..e80da46fc9 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -563,7 +563,7 @@ QVariant QV8Engine::toBasicVariant(v8::Handle value) struct StaticQtMetaObject : public QObject { static const QMetaObject *get() - { return &static_cast (0)->staticQtMetaObject; } + { return &staticQtMetaObject; } }; void QV8Engine::initializeGlobal(v8::Handle global) -- cgit v1.2.3