diff options
| -rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_tooltip.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 0fc3dbf4..96c57354 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -385,7 +385,7 @@ QQuickToolTip *QQuickToolTipAttachedPrivate::instance(bool create) const if (!tip && create) { // TODO: a cleaner way to create the instance? QQml(Meta)Type? QQmlComponent component(engine); - component.setData("import QtQuick.Controls 2.4; ToolTip { }", QUrl()); + component.setData("import QtQuick.Controls; ToolTip { }", QUrl()); QObject *object = component.create(); if (object) diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index 27ba6264..b4e992a4 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -218,8 +218,8 @@ TestCase { } function test_warning() { - ignoreWarning(Qt.resolvedUrl("tst_tooltip.qml") + ":78:5: QML QtObject: ToolTip must be attached to an Item") - ignoreWarning("<Unknown File>:1:30: QML ToolTip: cannot find any window to open popup in.") + ignoreWarning(new RegExp(".*QML QtObject: ToolTip must be attached to an Item")) + ignoreWarning(new RegExp(".*: QML ToolTip: cannot find any window to open popup in.")) object.ToolTip.show("") // don't crash (QTBUG-56243) } |