diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-12-20 17:14:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-12-20 17:14:19 +0100 |
| commit | 589fedf45544b1b0e89a69e99d3c8e2e13eedcda (patch) | |
| tree | 5bce5391a9166c621610df7bfc7989d8c1122927 /src/tools | |
| parent | a66fb3f6909b69c0793dc9f3b837c5ee9b7a4209 (diff) | |
| parent | ccc5359c420dd8388cb5a55aa0948b9297027b08 (diff) | |
| download | qt-creator-589fedf45544b1b0e89a69e99d3c8e2e13eedcda.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/projectexplorer/kitinformation.cpp
Change-Id: I94299b069418586db97d1d596a252794e4037556
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/sdktool/addtoolchainoperation.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index e194bbfdb9..8dca1282c3 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -140,8 +140,10 @@ bool AddToolChainOperation::setArguments(const QStringList &args) if (m_id.isEmpty()) std::cerr << "No id given for tool chain." << std::endl; - if (m_languageId.isEmpty()) + if (m_languageId.isEmpty()) { std::cerr << "No language id given for tool chain." << std::endl; + m_languageId = "2"; + } if (m_displayName.isEmpty()) std::cerr << "No name given for tool chain." << std::endl; if (m_path.isEmpty()) |