diff options
| author | hjk <qtc-committer@nokia.com> | 2008-12-11 14:04:45 +0100 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2008-12-11 14:04:45 +0100 |
| commit | 65d48ce4f6c4701b38ec868ea070f83192260853 (patch) | |
| tree | 79fc879ef87c08431d87da4bd894bd32989b3296 /src/plugins/cpptools/cpphoverhandler.cpp | |
| parent | a556ddada831c97c43d5c74bd1cb975b3da36fbc (diff) | |
| parent | 8b6575a06613f4773df1e9495ce81967193c78e4 (diff) | |
| download | qt-creator-65d48ce4f6c4701b38ec868ea070f83192260853.tar.gz | |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts:
src/plugins/debugger/gdbtypemacros.ui
Diffstat (limited to 'src/plugins/cpptools/cpphoverhandler.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpphoverhandler.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpphoverhandler.cpp b/src/plugins/cpptools/cpphoverhandler.cpp index 338123bc5e..f3831e5394 100644 --- a/src/plugins/cpptools/cpphoverhandler.cpp +++ b/src/plugins/cpptools/cpphoverhandler.cpp @@ -178,6 +178,16 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in } 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()) { // Move to the end of a qualified name bool stop = false; while (!stop) { |