diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
| commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
| tree | 19499220eb78ffc2b83174768e4db33f36d33242 /src/plugins/cpptools/cppcompletion_test.cpp | |
| parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
| parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
| download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
Diffstat (limited to 'src/plugins/cpptools/cppcompletion_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcompletion_test.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index d0c6504784..5823ad702e 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -1051,5 +1051,4 @@ void CppToolsPlugin::test_completion_enclosing_template_class_data() completions.append(QLatin1String("int_nested")); QTest::newRow("case: nested template class with enclosing template class") << code << completions; - } |