forked from qt-creator/qt-creator
ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator: * Allow for several toolchains of the same type * Be smarter wrt. guessing what kind of output a toolchain produces. This allows us to eventually handle e.g. embedded linux setups way better than before. * Be smarter wrt. guessing what kind of environment a Qt version needs. * Improve auto-detection of toolchains a bit * Decide on which debugger to use based on the kind of output produced by the compiler. * Add options page to configure toolchains * Remove toolchain related options from the Qt version dialog Reviewed-by: dt
This commit is contained in:
@@ -287,6 +287,13 @@ Utils::Environment QmlProjectRunConfiguration::environment() const
|
||||
return env;
|
||||
}
|
||||
|
||||
ProjectExplorer::Abi QmlProjectRunConfiguration::abi() const
|
||||
{
|
||||
ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
|
||||
return ProjectExplorer::Abi(hostAbi.architecture(), hostAbi.os(), hostAbi.osFlavor(),
|
||||
ProjectExplorer::Abi::Format_Runtime_QML, hostAbi.wordWidth());
|
||||
}
|
||||
|
||||
QVariantMap QmlProjectRunConfiguration::toMap() const
|
||||
{
|
||||
QVariantMap map(ProjectExplorer::RunConfiguration::toMap());
|
||||
|
||||
@@ -103,6 +103,8 @@ public:
|
||||
ProjectExplorer::OutputFormatter *createOutputFormatter() const;
|
||||
QVariantMap toMap() const;
|
||||
|
||||
ProjectExplorer::Abi abi() const;
|
||||
|
||||
public slots:
|
||||
void changeCurrentFile(Core::IEditor*);
|
||||
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <utils/debuggerlanguagechooser.h>
|
||||
#include <utils/detailswidget.h>
|
||||
#include <utils/environment.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <qt4projectmanager/qt4projectmanagerconstants.h>
|
||||
#include <qt4projectmanager/qtversionmanager.h>
|
||||
|
||||
Reference in New Issue
Block a user