diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
| commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
| tree | 98d321520f31107067ca45e5b5806d92551b2f3d /tests/auto/debugger | |
| parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
| parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
| download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'tests/auto/debugger')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index f6ecd1b4be..42f9b39b54 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -3428,7 +3428,7 @@ void tst_Dumpers::dumper_data() "unused(&a, &b);\n") + ForceC() - + GdbVersion(70600) + + GdbVersion(70500) + Check("a", "0 + 0 * I", "complex double") % GdbEngine + Check("b", "0 + 0 * I", "complex double") % GdbEngine @@ -4604,7 +4604,7 @@ GdbEngine + Check("d1", "43", "Ref1") + Check("a2", "\"hello\"", "std::string") - + Check("b2", "\"bababa\"", "std::string &") + + Check("b2", "\"bababa\"", Pattern("(std::)?string &")) // Clang... + Check("c2", "\"world\"", "std::string") + Check("d2", "\"hello\"", "Ref2") @@ -4894,6 +4894,18 @@ GdbEngine + Check("p3", "Thu Jan 1 00:00:00 1970", "boost::posix_time::ptime"); + QTest::newRow("BoostList") + << Data("#include <boost/container/list.hpp>\n", + "typedef std::pair<int, double> p;\n" + "boost::container::list<p> l;\n" + "l.push_back(p(13, 61));\n" + "l.push_back(p(14, 64));\n" + "l.push_back(p(15, 65));\n" + "l.push_back(p(16, 66));\n") + + BoostProfile() + + Check("l", "<4 items>", "boost::container::list<std::pair<int,double>>") + + Check("l.2.second", "65", "double"); + // // This tests qdump__KRBase in share/qtcreator/debugger/qttypes.py which uses // // a static typeflag to dispatch to subclasses"); @@ -4957,7 +4969,7 @@ GdbEngine "byte f = '2';\n" "int *x = (int*)&f;\n") + Check("f", "'2'", "byte") % LldbEngine - + Check("f", "50 '2'", "byte") % GdbEngine; + + Check("f", "50", "byte") % GdbEngine; // https://bugreports.qt-project.org/browse/QTCREATORBUG-4904 |