diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-09-27 12:52:54 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-01 15:53:02 +0200 |
commit | 1ee141664601fde419f3163f2330855ff48bf296 (patch) | |
tree | 66ee305d7fc6b6c56ec0f1d0d5ec4e6e8eb07ea9 /src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | |
parent | ac6a3fd5c70d7f999a739d229bdea18eb45eb240 (diff) | |
download | qt-creator-1ee141664601fde419f3163f2330855ff48bf296.tar.gz |
CppEditor: fix follow symbol under cursor in SIGNAL/SLOT macros
If the cursor was on the first character of a SIGNAL/SLOT name in a
QObject::connect call, the detection in findLinkAt failed.
Token::end() is the first position behind the token, so we must check
if positionInBlock is less than tk.end().
An extra branch has been added to handle the case where the cursor is
on the opening parenthesis after the identifier within a SIGNAL/SLOT
macro. This worked before, because of the "fuzziness" of the former
condition.
Task-number: QTCREATORBUG-10264
Change-Id: I2122bc2c13af1eb6c37dba9134d2b5ab931f80a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp')
-rw-r--r-- | src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 0ceb044676..c73135b300 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -1075,10 +1075,6 @@ void CppEditorPlugin::test_FollowSymbolUnderCursor_QObject_connect() if (!secondQObjectParam) source.replace(" &foo, ", QByteArray()); - if (start == '4' || start == 'A') { - qWarning("SIGNAL/SLOT before identifier triggers QTCREATORBUG-10264. Skipping."); - return; - } if (start >= '7' && !secondQObjectParam) { qWarning("SLOT jump triggers QTCREATORBUG-10265. Skipping."); return; |