feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
This commit is contained in:
Eike Ziller
2013-12-18 11:02:16 +01:00
parent fca56658bb 1193cfa092
commit e035ae6df1
62 changed files with 552 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
View File

@@ -124,6 +124,7 @@ public:
document->setUtf8Source(preprocessedSource);
QVERIFY(document->parse(parseMode));
document->check();
QVERIFY(document->diagnosticMessages().isEmpty());
snapshot.insert(document);
}
@@ -263,12 +264,14 @@ void tst_CheckSymbols::test_checksymbols_EnumerationUse()
{
const QByteArray source =
"enum E { Red, Green, Blue };\n"
"E e = Red\n";
"E e = Red;\n";
const QList<Use> expectedUses = QList<Use>()
<< Use(1, 6, 1, CppHighlightingSupport::TypeUse)
<< Use(1, 10, 3, CppHighlightingSupport::EnumerationUse)
<< Use(1, 15, 5, CppHighlightingSupport::EnumerationUse)
<< Use(1, 22, 4, CppHighlightingSupport::EnumerationUse)
<< Use(2, 1, 1, CppHighlightingSupport::TypeUse)
<< Use(2, 7, 3, CppHighlightingSupport::EnumerationUse)
;
TestData::check(source, expectedUses);
@@ -313,7 +316,7 @@ void tst_CheckSymbols::test_checksymbols_MacroUse()
{
const QByteArray source =
"#define FOO 1+1\n"
"int f() { FOO }\n";
"int f() { FOO; }\n";
const QList<Use> macroUses = QList<Use>()
<< Use(1, 9, 3, CppHighlightingSupport::MacroUse)
<< Use(2, 11, 3, CppHighlightingSupport::MacroUse);
@@ -877,7 +880,7 @@ void tst_CheckSymbols::test_checksymbols_QTCREATORBUG8974_danglingPointer()
" Singleton<INIManager>::instance().bar();\n"
" Singleton<INIManager>::instance().bar();\n"
" Singleton<INIManager>::instance().bar();\n"
"};\n"
"}\n"
;
const QList<Use> expectedUses = QList<Use>()
@@ -1477,7 +1480,7 @@ void tst_CheckSymbols::test_checksymbols_QTCREATORBUG9098()
" {\n"
" b.c;\n"
" }\n"
"}\n"
"};\n"
;
const QList<Use> expectedUses = QList<Use>()