From bde0f36262987b244d215bc10f68b09e4a380660 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 28 Sep 2016 15:59:10 +0200 Subject: Fix QQuickToolTipAttached parent The parent must not be a null item. Change-Id: Ide71a69e8cde8114542fa97570e0e5f5d724a884 Task-number: QTBUG-56243 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquicktooltip.cpp | 6 +++--- src/quicktemplates2/qquicktooltip_p.h | 2 +- tests/auto/controls/data/tst_tooltip.qml | 3 ++- 3 files changed, 6 insertions(+), 5 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) { } diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h index 227c6a4e..e39862bf 100644 --- a/src/quicktemplates2/qquicktooltip_p.h +++ b/src/quicktemplates2/qquicktooltip_p.h @@ -111,7 +111,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTipAttached : public QObject Q_PROPERTY(QQuickToolTip *toolTip READ toolTip CONSTANT FINAL) public: - explicit QQuickToolTipAttached(QQuickItem *item); + explicit QQuickToolTipAttached(QObject *parent); QString text() const; void setText(const QString &text); diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index 04064fa1..b80a2cae 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -185,6 +185,7 @@ TestCase { function test_warning() { ignoreWarning(Qt.resolvedUrl("tst_tooltip.qml") + ":68:5: QML QtObject: ToolTip must be attached to an Item") - object.ToolTip.text = "" + ignoreWarning(":1:30: QML ToolTip: cannot find any window to open popup in.") + object.ToolTip.show("") // don't crash (QTBUG-56243) } } -- cgit v1.2.3