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

ProjectExplorer: Support ABI triplet of cygwin (x86_64-pc-cygwin)

Browse Source 
Change-Id: Idd0cc7986e0e6ba8185b32f3bb69a9c9cbf3ffe0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-10-12 16:27:54 +03:00
committed by Orgad Shaneh
parent 6ced48ea89
commit eccc567651
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,7 +513,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
flavor = Abi::FreeBsdFlavor; flavor = Abi::FreeBsdFlavor;
format = Abi::ElfFormat; format = Abi::ElfFormat;
} else if (p == QLatin1String("mingw32") || p == QLatin1String("win32") } else if (p == QLatin1String("mingw32") || p == QLatin1String("win32")
|| p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")) { || p == QLatin1String("mingw32msvc") || p == QLatin1String("msys")
|| p == QLatin1String("cygwin")) {
arch = Abi::X86Architecture; arch = Abi::X86Architecture;
os = Abi::WindowsOS; os = Abi::WindowsOS;
flavor = Abi::WindowsMSysFlavor; flavor = Abi::WindowsMSysFlavor;
@@ -1082,6 +1083,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 64; << int(Abi::PEFormat) << 64;
QTest::newRow("x86_64-pc-cygwin") << int(Abi::X86Architecture)
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 64;
QTest::newRow("mingw32") << int(Abi::X86Architecture) QTest::newRow("mingw32") << int(Abi::X86Architecture)
<< int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor) << int(Abi::WindowsOS) << int(Abi::WindowsMSysFlavor)
<< int(Abi::PEFormat) << 0; << int(Abi::PEFormat) << 0;