diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:17 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:17 +0200 |
commit | 5e3ddf5f53836640573f46078779790256409f6d (patch) | |
tree | a73d622013e168a9497af4e5960ed5157a101560 /src | |
parent | 0779791684b3094d329cfe8e0c8550c091be1eed (diff) | |
parent | 16d347e4b31cc6a59d920d91b877f0b721c12a0b (diff) | |
download | qtscript-5e3ddf5f53836640573f46078779790256409f6d.tar.gz |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2
Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0
Diffstat (limited to 'src')
-rw-r--r-- | src/scripttools/debugging/qscriptdebugger.cpp | 2 |
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(); } |