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

Fix ABI detection of static mingw libraries on windows

Browse Source 
Task-number: QTCREATORBUG-4771
(cherry picked from commit fcf82b74b6)
This commit is contained in:
Tobias Hunger
2011-05-06 17:56:21 +02:00
committed by hjk
parent 8714d3ae43
commit f90a4d2ee1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,8 +506,6 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
if (!f.exists()) if (!f.exists())
return tmp; return tmp;
bool windowsStatic = path.endsWith(QLatin1String(".lib"));
f.open(QFile::ReadOnly); f.open(QFile::ReadOnly);
QByteArray data = f.read(1024); QByteArray data = f.read(1024);
if (data.size() >= 67 if (data.size() >= 67
@@ -534,12 +532,11 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
int toSkip = 60 + fileNameOffset; int toSkip = 60 + fileNameOffset;
offset += fileLength.toInt() + 60 /* header */; offset += fileLength.toInt() + 60 /* header */;
if (windowsStatic) {
if (fileName == QLatin1String("/0 ")) tmp.append(abiOf(data.mid(toSkip)));
tmp = parseCoffHeader(data.mid(toSkip, 20)); if (tmp.isEmpty() && fileName == QLatin1String("/0 "))
} else { tmp = parseCoffHeader(data.mid(toSkip, 20)); // This might be windws...
tmp.append(abiOf(data.mid(toSkip)));
}
if (!tmp.isEmpty() if (!tmp.isEmpty()
&& tmp.at(0).binaryFormat() != Abi::MachOFormat) && tmp.at(0).binaryFormat() != Abi::MachOFormat)
break; break;
@@ -606,6 +603,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("static QtCore: win msvc2008 (debug)") QTest::newRow("static QtCore: win msvc2008 (debug)")
<< QString::fromLatin1("%1/abi/static/win-msvc2008-debug.lib").arg(prefix) << QString::fromLatin1("%1/abi/static/win-msvc2008-debug.lib").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-windows-unknown-pe-32bit")); << (QStringList() << QString::fromLatin1("x86-windows-unknown-pe-32bit"));
QTest::newRow("static QtCore: win mingw")
<< QString::fromLatin1("%1/abi/static/win-mingw.a").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-windows-unknown-pe-32bit"));
QTest::newRow("static QtCore: mac (debug)") QTest::newRow("static QtCore: mac (debug)")
<< QString::fromLatin1("%1/abi/static/mac-32bit-debug.a").arg(prefix) << QString::fromLatin1("%1/abi/static/mac-32bit-debug.a").arg(prefix)
<< (QStringList() << QString::fromLatin1("x86-macos-generic-mach_o-32bit")); << (QStringList() << QString::fromLatin1("x86-macos-generic-mach_o-32bit"));