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

Make QNX a separate OS type

Browse Source 
Limits conflicts with Linux tool chains and debuggers.

Change-Id: Ie6408aecbc2828e8be53c46cf579441ccaba19bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
James McDonnell
2016-12-16 14:02:26 -05:00
parent 32a098d24d
commit e69c2eb2d5
7 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggeritem.cpp
View File

@@ -100,7 +100,13 @@ DebuggerItem::DebuggerItem(const QVariantMap &data)
m_abis.append(abi);
}
if (m_version.isEmpty())
bool mightBeAPreQnxSeparateOSQnxDebugger = m_command.fileName().startsWith("nto")
&& m_abis.count() == 1
&& m_abis[0].os() == Abi::UnknownOS
&& m_abis[0].osFlavor() == Abi::UnknownFlavor
&& m_abis[0].binaryFormat() == Abi::UnknownFormat;
if (m_version.isEmpty() || mightBeAPreQnxSeparateOSQnxDebugger)
reinitializeFromFile();
}