feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: Ic1d854234d047fc5cf0100b821d33ebd1fcd2921
This commit is contained in:
Eike Ziller
2015-10-26 10:53:55 +01:00
parent 23bdcf77b6 0749d66362
commit 56994830b9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/autotest/testtreeitem.cpp
View File

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

1
plugins/autotest/testxmloutputreader.cpp
View File

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