diff options
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassistprovider.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassistprovider.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppcompletionassistprovider.cpp b/src/plugins/cpptools/cppcompletionassistprovider.cpp index 2983fa27d4..9b878aa9cf 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.cpp +++ b/src/plugins/cpptools/cppcompletionassistprovider.cpp @@ -57,7 +57,7 @@ bool CppCompletionAssistProvider::isActivationCharSequence(const QString &sequen const QChar &ch = sequence.at(2); const QChar &ch2 = sequence.at(1); const QChar &ch3 = sequence.at(0); - if (activationSequenceChar(ch, ch2, ch3, 0, true) != 0) + if (activationSequenceChar(ch, ch2, ch3, 0, true, false) != 0) return true; return false; } @@ -71,7 +71,8 @@ int CppCompletionAssistProvider::activationSequenceChar(const QChar &ch, const QChar &ch2, const QChar &ch3, unsigned *kind, - bool wantFunctionCall) + bool wantFunctionCall, + bool wantQt5SignalSlots) { int referencePosition = 0; int completionKind = T_EOF_SYMBOL; @@ -136,6 +137,12 @@ int CppCompletionAssistProvider::activationSequenceChar(const QChar &ch, completionKind = T_POUND; referencePosition = 1; break; + case '&': + if (wantQt5SignalSlots) { + completionKind = T_AMPER; + referencePosition = 1; + } + break; } if (kind) |