Merge remote-tracking branch 'origin/4.10'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index e5be41a104..3faa87b1d2 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -5153,6 +5153,33 @@ void tst_Dumpers::dumper_data()
                + Check("set2.0", "[0]", "42", "int")
                + Check("set2.1", "[1]", "42", "int");
 
+    QTest::newRow("StdInitializerList")
+        << Data("#include <initializer_list>\n",
+                "auto initb = {true, false, false, true};\n"
+                "auto initi = {1, 2, 3};\n"
+                "auto inits = {\"1\", \"2\", \"3\"};\n"
+                "std::initializer_list<int> empty;\n"
+                "unused(&initb, &initi, &inits, &empty);\n")
+
+               + Cxx11Profile()
+
+               + Check("initb", "<4 items>", "std::initializer_list<bool>")
+               + Check("initb.0", "[0]", "1", "bool") // 1 -> true is done on display
+               + Check("initb.1", "[1]", "0", "bool")
+               + Check("initb.2", "[2]", "0", "bool")
+               + Check("initb.3", "[3]", "1", "bool")
+
+               + Check("initi", "<3 items>", "std::initializer_list<int>")
+               + Check("initi.0", "[0]", "1", "int")
+               + Check("initi.1", "[1]", "2", "int")
+               + Check("initi.2", "[2]", "3", "int")
+
+               + Check("inits", "<3 items>", "std::initializer_list<const char *>")
+               + Check("inits.0", "[0]", "\"1\"", "char*")
+               + Check("inits.1", "[1]", "\"2\"", "char*")
+               + Check("inits.2", "[2]", "\"3\"", "char*")
+
+               + Check("empty", "<0 items>", "std::initializer_list<int>");
 
 //    class Goo
 //    {