diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-26 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-26 01:00:13 +0200 |
| commit | 7f0804a86ffd597ff5c43bf779a6c81c23a9f860 (patch) | |
| tree | 247ba128b624da59fa49d9fda8737e5c3398dea2 /tools | |
| parent | 4f0ff0c152f65d7d1f255c4549167bb020d1c4f4 (diff) | |
| parent | 50f05e20d5609d44159831c899bedd35653a66ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Iff22da70d6301f9098360bb5abbb29087c7677d9
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 311e044ec3..dffac93f20 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -124,14 +124,14 @@ void collectReachableMetaObjects(QObject *object, QSet<const QMetaObject *> *met const QMetaObject *meta = object->metaObject(); if (verbose) - std::cerr << "Processing object" << qPrintable( meta->className() ) << std::endl; + std::cerr << "Processing object " << qPrintable( meta->className() ) << std::endl; collectReachableMetaObjects(meta, metas); for (int index = 0; index < meta->propertyCount(); ++index) { QMetaProperty prop = meta->property(index); if (QQmlMetaType::isQObject(prop.userType())) { if (verbose) - std::cerr << " Processing property" << qPrintable( prop.name() ) << std::endl; + std::cerr << " Processing property " << qPrintable( prop.name() ) << std::endl; currentProperty = QString("%1::%2").arg(meta->className(), prop.name()); // if the property was not initialized during construction, @@ -337,7 +337,7 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, collectReachableMetaObjects(object, &metas); object->deleteLater(); } else { - std::cerr << "Could not create" << qPrintable(tyName) << std::endl; + std::cerr << "Could not create " << qPrintable(tyName) << std::endl; } } } @@ -732,7 +732,7 @@ enum ExitCode { }; #ifdef Q_OS_UNIX -void sigSegvHandler(int) { +Q_NORETURN void sigSegvHandler(int) { fprintf(stderr, "Error: SEGV\n"); if (!currentProperty.isEmpty()) fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData()); |