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

Use Utils::FileName in abi

Browse Source 
Use FileName when passing in a file to extract ABIs from. Also convert
some helper functions in baseqtversion to use FileNames in favor of
normal strings.

Change-Id: I41c724c4c05bb4ff0d8b832f84fffa08d64762d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-13 15:07:32 +01:00
parent daac078756
commit 664fb6339b
8 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/abi.cpp
View File

@@ -669,13 +669,13 @@ Abi Abi::hostAbi()
return Abi(arch, os, subos, format, QSysInfo::WordSize);
}
QList<Abi> Abi::abisOfBinary(const QString &path)
QList<Abi> Abi::abisOfBinary(const Utils::FileName &path)
{
QList<Abi> tmp;
if (path.isEmpty())
return tmp;
QFile f(path);
QFile f(path.toString());
if (!f.exists())
return tmp;
@@ -692,7 +692,7 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
while (!data.isEmpty()) {
if ((getUint8(data, 58) != 0x60 || getUint8(data, 59) != 0x0a)) {
qWarning() << path << ": Thought it was an ar-file, but it is not!";
qWarning() << path.toString() << ": Thought it was an ar-file, but it is not!";
break;
}
@@ -857,7 +857,7 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary()
QFETCH(QString, file);
QFETCH(QStringList, abis);
QList<ProjectExplorer::Abi> result = Abi::abisOfBinary(file);
QList<ProjectExplorer::Abi> result = Abi::abisOfBinary(Utils::FileName::fromString(file));
QCOMPARE(result.count(), abis.count());
for (int i = 0; i < abis.count(); ++i)
QCOMPARE(result.at(i).toString(), abis.at(i));