Merge remote-tracking branch 'origin/4.2'

 Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0

4 files changed, 28 insertions, 10 deletions

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index eb11875f83..5feaa4871f 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -5198,6 +5198,20 @@ void tst_Dumpers::dumper_data()
                 + Check("fd", "d (2)", "Foo");
 
 
+    QTest::newRow("EnumFlags")
+            << Data("\n"
+                    "enum Flags { one = 1, two = 2, four = 4 };\n",
+                    "Flags fone = one; unused(&fone);\n"
+                    "Flags fthree = (Flags)(one|two); unused(&fthree);\n"
+                    "Flags fmixed = (Flags)(two|8); unused(&fmixed);\n"
+                    "Flags fbad = (Flags)(24); unused(&fbad);\n")
+               + GdbEngine
+               + Check("fone", "one (1)", "Flags")
+               + Check("fthree", "(one | two) (3)", "Flags")
+               + Check("fmixed", "(two | unknown:8) (10)", "Flags")
+               + Check("fbad", "(unknown:24) (24)", "Flags");
+
+
     QTest::newRow("Array")
             << Data("double a1[3][3];\n"
                     "for (int i = 0; i != 3; ++i)\n"
diff --git a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
index 926bc49c9c..e5518c8c99 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorDebuggers>
-<!-- Written by QtCreator 3.3.81, 2015-02-17T18:11:11. -->
+<!-- Written by QtCreator 4.2.2, 2017-02-10T17:36:35. -->
 <qtcreator>
  <data>
   <variable>DebuggerItem.0</variable>
   <valuemap type="QVariantMap">
    <valuelist type="QVariantList" key="Abis">
-    <value type="QString">x86-windows-msvc2010-pe-64bit</value>
+    <value type="QString">x86-windows-msvc2015-pe-64bit</value>
    </valuelist>
    <value type="bool" key="AutoDetected">true</value>
    <value type="QString" key="AutoDetectionSource"></value>
-   <value type="QString" key="Binary">C:/Program Files/Debugging Tools for Windows (x64)/cdb.exe</value>
-   <value type="QString" key="DisplayName">Auto-detected CDB at C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
+   <value type="QString" key="Binary">C:/Program Files (x86)/Windows Kits/10/Debuggers/x64/cdb.exe</value>
+   <value type="QString" key="DisplayName">Auto-detected CDB at C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe</value>
    <value type="int" key="EngineType">4</value>
-   <value type="QString" key="Id">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+   <value type="QString" key="Id">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
+   <value type="QDateTime" key="LastModified"></value>
    <value type="QString" key="Version"></value>
+   <value type="QString" key="WorkingDirectory"></value>
   </valuemap>
  </data>
  <data>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index f7656fd7e4..b88210ec3e 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 4.2.1, 2017-01-05T18:03:28. -->
+<!-- Written by QtCreator 4.2.2, 2017-02-10T17:44:37. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
@@ -37,7 +37,7 @@
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
     <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <valuelist type="QVariantList" key="PE.Profile.Environment"/>
@@ -65,7 +65,7 @@
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
     <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <valuelist type="QVariantList" key="PE.Profile.Environment"/>
@@ -121,7 +121,7 @@
    <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
     <value type="QString" key="Android.GdbServer.Information"></value>
-    <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
+    <value type="QString" key="Debugger.Information">{1b25f20a-d584-4fb7-85b3-74dd15b82f6f}</value>
     <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <valuelist type="QVariantList" key="PE.Profile.Environment"/>
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index bb5b3da610..23487e4bd4 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -87,7 +87,8 @@ def __checkBuildAndRun__():
 def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems,
                         additionalFunc, *additionalParameters):
     global currentSelectedTreeItem
-    model = waitForObject(treeObjStr).model()
+    tree = waitForObject(treeObjStr)
+    model = tree.model()
     items = dumpIndices(model, section)
     for it in items:
         indexName = str(it.data().toString())
@@ -97,6 +98,7 @@ def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems,
         if alreadyDone:
             itObj = "%s occurrence='%d'}" % (itObj[:-1], alreadyDone + 1)
         currentSelectedTreeItem = waitForObject(itObj, 3000)
+        tree.scrollTo(it)
         mouseClick(currentSelectedTreeItem, 5, 5, 0, Qt.LeftButton)
         additionalFunc(indexName, *additionalParameters)
         currentSelectedTreeItem = None