diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-28 15:59:10 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-28 14:37:14 +0000 |
| commit | bde0f36262987b244d215bc10f68b09e4a380660 (patch) | |
| tree | 73698d52106ad1b4e8b02f9ea6ed23cdd7ef3d9d /src/quicktemplates2/qquicktooltip.cpp | |
| parent | 25a3f25ce98c0a88582e97cfcdede970e7cc4a6d (diff) | |
Fix QQuickToolTipAttached parent
The parent must not be a null item.
Change-Id: Ide71a69e8cde8114542fa97570e0e5f5d724a884
Task-number: QTBUG-56243
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquicktooltip.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index e08078f6..6b025fe5 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -250,7 +250,7 @@ QQuickToolTipAttached *QQuickToolTip::qmlAttachedProperties(QObject *object) if (!item) qmlInfo(object) << "ToolTip must be attached to an Item"; - return new QQuickToolTipAttached(item); + return new QQuickToolTipAttached(object); } void QQuickToolTip::open() @@ -350,8 +350,8 @@ QQuickToolTip *QQuickToolTipAttachedPrivate::instance(bool create) const return tip; } -QQuickToolTipAttached::QQuickToolTipAttached(QQuickItem *item) : - QObject(*(new QQuickToolTipAttachedPrivate), item) +QQuickToolTipAttached::QQuickToolTipAttached(QObject *parent) : + QObject(*(new QQuickToolTipAttachedPrivate), parent) { } |