Merge commit 'origin/0.9.1-beta'

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/cpptools/cpphoverhandler.cpp b/src/plugins/cpptools/cpphoverhandler.cpp
index fab0d83b31..497ac78d74 100644
--- a/src/plugins/cpptools/cpphoverhandler.cpp
+++ b/src/plugins/cpptools/cpphoverhandler.cpp
@@ -177,14 +177,14 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
                 break;
             }
         }
-    }
 
-    if (m_toolTip.isEmpty()) {
-        unsigned lineno = tc.blockNumber() + 1;
-        foreach (const Document::Include &incl, doc->includes()) {
-            if (lineno == incl.line()) {
-                m_toolTip = incl.fileName();
-                break;
+        if (m_toolTip.isEmpty()) {
+            unsigned lineno = tc.blockNumber() + 1;
+            foreach (const Document::Include &incl, doc->includes()) {
+                if (lineno == incl.line()) {
+                    m_toolTip = incl.fileName();
+                    break;
+                }
             }
         }
     }