Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa

1 files changed, 5 insertions, 7 deletions

diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp
index 8947976c91..7617403c81 100644
--- a/src/libs/utils/tooltip/tooltip.cpp
+++ b/src/libs/utils/tooltip/tooltip.cpp
@@ -48,13 +48,6 @@ ToolTip::ToolTip() : m_tip(0), m_widget(0)
 {
     connect(&m_showTimer, &QTimer::timeout, this, &ToolTip::hideTipImmediately);
     connect(&m_hideDelayTimer, &QTimer::timeout, this, &ToolTip::hideTipImmediately);
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()),
-            &QGuiApplication::applicationStateChanged,
-            [this](Qt::ApplicationState state) {
-                if (state != Qt::ApplicationActive)
-                    hideTipImmediately();
-            }
-    );
 }
 
 ToolTip::~ToolTip()
@@ -290,6 +283,11 @@ void ToolTip::placeTip(const QPoint &pos, QWidget *w)
 
 bool ToolTip::eventFilter(QObject *o, QEvent *event)
 {
+    if (m_tip && event->type() == QEvent::ApplicationStateChange
+            && qApp->applicationState() != Qt::ApplicationActive) {
+        hideTipImmediately();
+    }
+
     if (!o->isWidgetType())
         return false;