diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
| commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
| tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /src/qml/types/qquickpackage.cpp | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
| parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'src/qml/types/qquickpackage.cpp')
| -rw-r--r-- | src/qml/types/qquickpackage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index e0d1888f33..03539d8737 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickPackage \inqmlmodule QtQuick \ingroup qtquick-views - \brief Specifies a collection of named items + \brief Specifies a collection of named items. The Package type is used in conjunction with DelegateModel to enable delegates with a shared context @@ -183,7 +183,7 @@ QObject *QQuickPackage::part(const QString &name) if (name == QLatin1String("default") && !d->dataList.isEmpty()) return d->dataList.at(0); - return 0; + return nullptr; } QQuickPackageAttached *QQuickPackage::qmlAttachedProperties(QObject *o) |