diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-27 08:43:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-27 08:43:10 +0100 |
| commit | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (patch) | |
| tree | 06c325dc386afd26281ba0ebdbf4fd3f56f892b0 /tools/qmlplugindump | |
| parent | 41edb3bd9f373a865d5698ac8c18bf341071eae9 (diff) | |
| parent | e41d067227eb6225b05df88ab724708588fa5304 (diff) | |
| download | qtdeclarative-bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/qml/parser/qqmljslexer.cpp
src/qml/qml/v8/qv8engine.cpp
src/qml/util/qqmladaptormodel_p.h
src/quick/items/qquickanimatedsprite.cpp
tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 422e37fd89..5c5a6a8eb1 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -300,7 +300,7 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, continue; inObjectInstantiation = tyName; - QObject *object = 0; + QObject *object = nullptr; if (ty.isSingleton()) { QQmlType::SingletonInstanceInfo *siinfo = ty.singletonInstanceInfo(); @@ -403,7 +403,7 @@ public: return exportString; } - void writeMetaContent(const QMetaObject *meta, KnownAttributes *knownAttributes = 0) + void writeMetaContent(const QMetaObject *meta, KnownAttributes *knownAttributes = nullptr) { QSet<QString> implicitSignals; for (int index = meta->propertyOffset(); index < meta->propertyCount(); ++index) { @@ -642,7 +642,7 @@ private: qml->writeScriptBinding(QLatin1String("isPointer"), QLatin1String("true")); } - void dump(const QMetaProperty &prop, KnownAttributes *knownAttributes = 0) + void dump(const QMetaProperty &prop, KnownAttributes *knownAttributes = nullptr) { int revision = prop.revision(); QByteArray propName = prop.name(); @@ -658,7 +658,7 @@ private: } void dump(const QMetaMethod &meth, const QSet<QString> &implicitSignals, - KnownAttributes *knownAttributes = 0) + KnownAttributes *knownAttributes = nullptr) { if (meth.methodType() == QMetaMethod::Signal) { if (meth.access() != QMetaMethod::Public) @@ -973,7 +973,7 @@ int main(int argc, char *argv[]) sigAction.sa_handler = &sigSegvHandler; sigAction.sa_flags = 0; - sigaction(SIGSEGV, &sigAction, 0); + sigaction(SIGSEGV, &sigAction, nullptr); #endif #ifdef QT_SIMULATOR |