diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
| commit | e426d08e54bd10b7513a3ced9cf9237b75b06b45 (patch) | |
| tree | b4f20c8d93877aa4ef6964ec8c700102def865d0 /src/plugins/qnx/qnxtoolchain.h | |
| parent | 26e51ff633a8d3b60ec25fe875724cfe5e3f92df (diff) | |
| parent | ea1f5d2b6c896f9dc5791d981ab5a8630f4561f6 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/debugger/debuggerruncontrol.cpp
Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
Diffstat (limited to 'src/plugins/qnx/qnxtoolchain.h')
| -rw-r--r-- | src/plugins/qnx/qnxtoolchain.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/qnxtoolchain.h b/src/plugins/qnx/qnxtoolchain.h index 8314b9f62f..193e7e36f8 100644 --- a/src/plugins/qnx/qnxtoolchain.h +++ b/src/plugins/qnx/qnxtoolchain.h @@ -50,7 +50,7 @@ public: void setNdkPath(const QString &ndkPath); protected: - virtual QList<ProjectExplorer::Abi> detectSupportedAbis() const override; + virtual DetectedAbisResult detectSupportedAbis() const override; QStringList reinterpretOptions(const QStringList &args) const override; |