diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-22 22:18:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-22 22:20:46 +0200 |
| commit | d1990ff285a8a265fc41d193179ce8fb6746f7b3 (patch) | |
| tree | d4e78a873de079a04d2b4d64d81e4a4af84b3ae7 /src/quicktemplates2/qquicktooltip.cpp | |
| parent | 309170a7f97759aa3f2e25a6c5202a6438a8bf4f (diff) | |
| parent | 53c4bc2d1004fe963759b4009508bbc3e3fbca3e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I9188f94e40e2ecb4da1963ce2fcf915ab7a4b4fb
Diffstat (limited to 'src/quicktemplates2/qquicktooltip.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 1aeb9914..f0bc6ffc 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -36,6 +36,7 @@ #include "qquicktooltip_p.h" #include "qquickpopup_p_p.h" +#include "qquickpopupitem_p_p.h" #include "qquickcontrol_p_p.h" #include <QtCore/qbasictimer.h> @@ -172,6 +173,7 @@ QQuickToolTip::QQuickToolTip(QQuickItem *parent) Q_D(QQuickToolTip); d->allowVerticalFlip = true; d->allowHorizontalFlip = true; + d->popupItem->setHoverEnabled(false); // QTBUG-63644 } /*! |