Merge remote-tracking branch 'origin/3.6'

Change-Id: Ic1d854234d047fc5cf0100b821d33ebd1fcd2921

plugins/autotest/testtreeitem.cpp

@@ -73,7 +73,7 @@ static QIcon testTreeIcon(TestTreeItem::Type type)
         QIcon(QLatin1String(":/images/func.png")),
         QIcon(QLatin1String(":/images/data.png"))
     };
-    if (type >= sizeof(icons))
+    if (static_cast<unsigned long>(type) >= sizeof(icons))
         return icons[2];
     return icons[type];
 }

plugins/autotest/testxmloutputreader.cpp

@@ -23,6 +23,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
+#include <QDebug>
 #include <QRegExp>
 #include <QProcess>
 #include <QFileInfo>