diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
| commit | 2786250c172138c1ece456305264f7b5039b8f2a (patch) | |
| tree | dd0a56d98aefe9e1c6a3042b5cbcc37e87bd903b /src/plugins/cpptools | |
| parent | e9d433a99a8fa4769df92f9caaaaaec049596c34 (diff) | |
| parent | 27cc89eb4a1e157c68793718602416448547de20 (diff) | |
| download | qt-creator-2786250c172138c1ece456305264f7b5039b8f2a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppcompletion_test.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 1169ab7714..51f3359101 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -1857,6 +1857,20 @@ void CppToolsPlugin::test_completion_data() << QLatin1String("val2") << QLatin1String("val3")); + QTest::newRow("nested_anonymous_with___attribute__") << _( + "struct Enclosing\n" + "{\n" + " struct __attribute__((aligned(8)))\n" + " {\n" + " int i;\n" + " };\n" + "};\n" + "Enclosing e;\n" + "@\n" + ) << _("e.") << (QStringList() + << QLatin1String("Enclosing") + << QLatin1String("i")); + QTest::newRow("enum_inside_namespace") << _( "namespace Ns\n" "{\n" |