forked from qt-creator/qt-creator
		
	Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline
This commit is contained in:
		@@ -1264,17 +1264,12 @@ void CppCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio
 | 
			
		||||
                if (c.isUpper() && !first) {
 | 
			
		||||
                    keyRegExp += QLatin1String("[a-z0-9_]*");
 | 
			
		||||
                    keyRegExp += c;
 | 
			
		||||
                } else if (m_caseSensitivity == Qt::CaseInsensitive && c.isLower()) {
 | 
			
		||||
                    keyRegExp += QLatin1Char('[');
 | 
			
		||||
                    keyRegExp += c;
 | 
			
		||||
                    keyRegExp += c.toUpper();
 | 
			
		||||
                    keyRegExp += QLatin1Char(']');
 | 
			
		||||
                } else {
 | 
			
		||||
                    keyRegExp += QRegExp::escape(c);
 | 
			
		||||
                }
 | 
			
		||||
                first = false;
 | 
			
		||||
            }
 | 
			
		||||
            const QRegExp regExp(keyRegExp, Qt::CaseSensitive);
 | 
			
		||||
            const QRegExp regExp(keyRegExp, m_caseSensitivity);
 | 
			
		||||
 | 
			
		||||
            foreach (TextEditor::CompletionItem item, m_completions) {
 | 
			
		||||
                if (regExp.indexIn(item.m_text) == 0) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user