summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-15 03:01:51 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-15 03:01:52 +0200
commit9096c11e57f9e073648ec3636bac499f006c5362 (patch)
treeba1ceaadc7588fe843a222cfae4380161298d312
parent97f194cfabf9d8ab186241760a29bae1f4811184 (diff)
parent5e3ddf5f53836640573f46078779790256409f6d (diff)
downloadqtscript-9096c11e57f9e073648ec3636bac499f006c5362.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ibbbb491c8a532376eae3879ac3a545180e1728ff
-rw-r--r--src/scripttools/debugging/qscriptdebugger.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index 5f589d4..5549f92 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -656,7 +656,9 @@ public:
}
tip = lines.join(QLatin1String("\n"));
}
+#if QT_CONFIG(tooltip)
QToolTip::showText(m_pos, tip);
+#endif
finish();
}