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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
This commit is contained in:
Eike Ziller
2012-10-25 10:45:58 +02:00
parent b9e21803d6 becdcdc4f4
commit 0a1bdf4257
45 changed files with 17728 additions and 12311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -732,5 +732,5 @@ void tst_Semantic::diagnostic_error()
QCOMPARE(doc->globals->memberCount(), 1U);
}
QTEST_APPLESS_MAIN(tst_Semantic)
QTEST_MAIN(tst_Semantic)
#include "tst_semantic.moc"