summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/cppeditor/compileroptionsbuilder.cpp2
-rw-r--r--src/plugins/cppeditor/projectpart.cpp1
-rw-r--r--src/plugins/cppeditor/projectpart.h1
-rw-r--r--src/plugins/projectexplorer/gcctoolchain.cpp56
-rw-r--r--src/plugins/projectexplorer/gcctoolchainfactories.h3
-rw-r--r--src/plugins/projectexplorer/rawprojectpart.cpp3
-rw-r--r--src/plugins/projectexplorer/rawprojectpart.h1
-rw-r--r--src/plugins/projectexplorer/toolchain.cpp23
-rw-r--r--src/plugins/projectexplorer/toolchain.h4
9 files changed, 91 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp
index 73994fd9c9..9a524f8bf0 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp
@@ -254,7 +254,7 @@ void CompilerOptionsBuilder::addWordWidth()
void CompilerOptionsBuilder::addTargetTriple()
{
- const QString target = m_explicitTarget.isEmpty()
+ const QString target = m_explicitTarget.isEmpty() || m_projectPart.targetTripleIsAuthoritative
? m_projectPart.toolChainTargetTriple : m_explicitTarget;
// Only "--target=" style is accepted in both g++ and cl driver modes.
diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp
index 930466e0fe..d1935e15de 100644
--- a/src/plugins/cppeditor/projectpart.cpp
+++ b/src/plugins/cppeditor/projectpart.cpp
@@ -153,6 +153,7 @@ ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
toolchainType(tcInfo.type),
isMsvc2015Toolchain(tcInfo.isMsvc2015ToolChain),
toolChainTargetTriple(tcInfo.targetTriple),
+ targetTripleIsAuthoritative(tcInfo.targetTripleIsAuthoritative),
toolChainWordWidth(tcInfo.wordWidth == 64 ? ProjectPart::WordWidth64Bit
: ProjectPart::WordWidth32Bit),
toolChainInstallDir(tcInfo.installDir),
diff --git a/src/plugins/cppeditor/projectpart.h b/src/plugins/cppeditor/projectpart.h
index bad2d4cf99..0263d3b283 100644
--- a/src/plugins/cppeditor/projectpart.h
+++ b/src/plugins/cppeditor/projectpart.h
@@ -114,6 +114,7 @@ public:
const Utils::Id toolchainType;
const bool isMsvc2015Toolchain = false;
const QString toolChainTargetTriple;
+ const bool targetTripleIsAuthoritative;
const ToolChainWordWidth toolChainWordWidth = WordWidth32Bit;
const Utils::FilePath toolChainInstallDir;
const Utils::FilePath compilerFilePath;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 31ae2f6819..9ba63b5400 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -42,11 +42,13 @@
#include <utils/qtcprocess.h>
#include <QBuffer>
+#include <QCheckBox>
#include <QComboBox>
#include <QCoreApplication>
#include <QDir>
#include <QFileInfo>
#include <QFormLayout>
+#include <QHBoxLayout>
#include <QLineEdit>
#include <QLoggingCategory>
#include <QRegularExpression>
@@ -1203,10 +1205,53 @@ Toolchains GccToolChainFactory::autoDetectToolChain(const ToolChainDescription &
// GccToolChainConfigWidget
// --------------------------------------------------------------------------
+namespace Internal {
+class TargetTripleWidget : public QWidget
+{
+ Q_OBJECT
+
+public:
+ TargetTripleWidget(const ToolChain *toolchain)
+ {
+ const auto layout = new QHBoxLayout(this);
+ layout->setContentsMargins(0, 0, 0, 0);
+ m_tripleLineEdit.setEnabled(false);
+ m_overrideCheckBox.setText(tr("Override for code model"));
+ m_overrideCheckBox.setToolTip(tr("Check this button in the rare case that the code model\n"
+ "fails because clang does not understand the target architecture."));
+ layout->addWidget(&m_tripleLineEdit);
+ layout->addWidget(&m_overrideCheckBox);
+ layout->addStretch(1);
+
+ connect(&m_tripleLineEdit, &QLineEdit::textEdited, this, &TargetTripleWidget::valueChanged);
+ connect(&m_overrideCheckBox, &QCheckBox::toggled,
+ &m_tripleLineEdit, &QLineEdit::setEnabled);
+
+ m_tripleLineEdit.setText(toolchain->effectiveCodeModelTargetTriple());
+ m_overrideCheckBox.setChecked(!toolchain->explicitCodeModelTargetTriple().isEmpty());
+ }
+
+ QString explicitCodeModelTargetTriple() const
+ {
+ if (m_overrideCheckBox.isChecked())
+ return m_tripleLineEdit.text();
+ return {};
+ }
+
+signals:
+ void valueChanged();
+
+private:
+ QLineEdit m_tripleLineEdit;
+ QCheckBox m_overrideCheckBox;
+};
+}
+
GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
ToolChainConfigWidget(tc),
m_abiWidget(new AbiWidget),
- m_compilerCommand(new PathChooser)
+ m_compilerCommand(new PathChooser),
+ m_targetTripleWidget(new TargetTripleWidget(tc))
{
Q_ASSERT(tc);
@@ -1222,6 +1267,7 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
m_platformLinkerFlagsLineEdit->setText(ProcessArgs::joinArgs(tc->platformLinkerFlags()));
m_mainLayout->addRow(tr("Platform linker flags:"), m_platformLinkerFlagsLineEdit);
m_mainLayout->addRow(tr("&ABI:"), m_abiWidget);
+ m_mainLayout->addRow(tr("Target triple:"), m_targetTripleWidget);
m_abiWidget->setEnabled(false);
addErrorLabel();
@@ -1235,6 +1281,8 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
connect(m_platformLinkerFlagsLineEdit, &QLineEdit::editingFinished,
this, &GccToolChainConfigWidget::handlePlatformLinkerFlagsChange);
connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty);
+ connect(m_targetTripleWidget, &TargetTripleWidget::valueChanged,
+ this, &ToolChainConfigWidget::dirty);
}
void GccToolChainConfigWidget::applyImpl()
@@ -1252,6 +1300,7 @@ void GccToolChainConfigWidget::applyImpl()
}
tc->setInstallDir(tc->detectInstallDir());
tc->setOriginalTargetTriple(tc->detectSupportedAbis().originalTargetTriple);
+ tc->setExplicitCodeModelTargetTriple(m_targetTripleWidget->explicitCodeModelTargetTriple());
tc->setDisplayName(displayName); // reset display name
tc->setPlatformCodeGenFlags(splitString(m_platformCodeGenFlagsLineEdit->text()));
tc->setPlatformLinkerFlags(splitString(m_platformLinkerFlagsLineEdit->text()));
@@ -1290,6 +1339,8 @@ bool GccToolChainConfigWidget::isDirtyImpl() const
!= ProcessArgs::joinArgs(tc->platformCodeGenFlags())
|| m_platformLinkerFlagsLineEdit->text()
!= ProcessArgs::joinArgs(tc->platformLinkerFlags())
+ || m_targetTripleWidget->explicitCodeModelTargetTriple()
+ != tc->explicitCodeModelTargetTriple()
|| (m_abiWidget && m_abiWidget->currentAbi() != tc->targetAbi());
}
@@ -1300,6 +1351,7 @@ void GccToolChainConfigWidget::makeReadOnlyImpl()
m_abiWidget->setEnabled(false);
m_platformCodeGenFlagsLineEdit->setEnabled(false);
m_platformLinkerFlagsLineEdit->setEnabled(false);
+ m_targetTripleWidget->setEnabled(false);
m_isReadOnly = true;
}
@@ -2103,3 +2155,5 @@ void ProjectExplorerPlugin::testGccAbiGuessing()
} // namespace ProjectExplorer
#endif
+
+#include <gcctoolchain.moc>
diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h
index 8b970f6eb0..efc75677c4 100644
--- a/src/plugins/projectexplorer/gcctoolchainfactories.h
+++ b/src/plugins/projectexplorer/gcctoolchainfactories.h
@@ -71,6 +71,8 @@ protected:
// GccToolChainConfigWidget
// --------------------------------------------------------------------------
+class TargetTripleWidget;
+
class GccToolChainConfigWidget : public ToolChainConfigWidget
{
Q_OBJECT
@@ -96,6 +98,7 @@ private:
Utils::PathChooser *m_compilerCommand;
QLineEdit *m_platformCodeGenFlagsLineEdit;
QLineEdit *m_platformLinkerFlagsLineEdit;
+ TargetTripleWidget * const m_targetTripleWidget;
bool m_isReadOnly = false;
ProjectExplorer::Macros m_macros;
diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp
index 45aa810aa4..3ab076263c 100644
--- a/src/plugins/projectexplorer/rawprojectpart.cpp
+++ b/src/plugins/projectexplorer/rawprojectpart.cpp
@@ -182,7 +182,8 @@ ToolChainInfo::ToolChainInfo(const ToolChain *toolChain,
type = toolChain->typeId();
isMsvc2015ToolChain = toolChain->targetAbi().osFlavor() == Abi::WindowsMsvc2015Flavor;
wordWidth = toolChain->targetAbi().wordWidth();
- targetTriple = toolChain->originalTargetTriple();
+ targetTriple = toolChain->effectiveCodeModelTargetTriple();
+ targetTripleIsAuthoritative = !toolChain->explicitCodeModelTargetTriple().isEmpty();
extraCodeModelFlags = toolChain->extraCodeModelFlags();
installDir = toolChain->installDir();
compilerFilePath = toolChain->compilerCommand();
diff --git a/src/plugins/projectexplorer/rawprojectpart.h b/src/plugins/projectexplorer/rawprojectpart.h
index e430dfa365..96a11d0f6d 100644
--- a/src/plugins/projectexplorer/rawprojectpart.h
+++ b/src/plugins/projectexplorer/rawprojectpart.h
@@ -154,6 +154,7 @@ public:
public:
Utils::Id type;
bool isMsvc2015ToolChain = false;
+ bool targetTripleIsAuthoritative = false;
unsigned wordWidth = 0;
QString targetTriple;
Utils::FilePath compilerFilePath;
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 51a4e00665..2572d25443 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -49,6 +49,7 @@ static const char AUTODETECT_KEY[] = "ProjectExplorer.ToolChain.Autodetect";
static const char DETECTION_SOURCE_KEY[] = "ProjectExplorer.ToolChain.DetectionSource";
static const char LANGUAGE_KEY_V1[] = "ProjectExplorer.ToolChain.Language"; // For QtCreator <= 4.2
static const char LANGUAGE_KEY_V2[] = "ProjectExplorer.ToolChain.LanguageV2"; // For QtCreator > 4.2
+const char CODE_MODEL_TRIPLE_KEY[] = "ExplicitCodeModelTargetTriple";
namespace ProjectExplorer {
namespace Internal {
@@ -86,6 +87,7 @@ public:
Utils::Id m_language;
Detection m_detection = ToolChain::UninitializedDetection;
QString m_detectionSource;
+ QString m_explicitCodeModelTargetTriple;
ToolChain::MacrosCache m_predefinedMacrosCache;
ToolChain::HeaderPathsCache m_headerPathsCache;
@@ -262,6 +264,7 @@ QVariantMap ToolChain::toMap() const
result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
result.insert(QLatin1String(AUTODETECT_KEY), isAutoDetected());
result.insert(QLatin1String(DETECTION_SOURCE_KEY), d->m_detectionSource);
+ result.insert(CODE_MODEL_TRIPLE_KEY, d->m_explicitCodeModelTargetTriple);
// <Compatibility with QtC 4.2>
int oldLanguageId = -1;
if (language() == ProjectExplorer::Constants::C_LANGUAGE_ID)
@@ -370,6 +373,8 @@ bool ToolChain::fromMap(const QVariantMap &data)
d->m_detection = autoDetect ? AutoDetection : ManualDetection;
d->m_detectionSource = data.value(DETECTION_SOURCE_KEY).toString();
+ d->m_explicitCodeModelTargetTriple = data.value(CODE_MODEL_TRIPLE_KEY).toString();
+
if (data.contains(LANGUAGE_KEY_V2)) {
// remove hack to trim language id in 4.4: This is to fix up broken language
// ids that happened in 4.3 master branch
@@ -503,6 +508,24 @@ QString ToolChain::sysRoot() const
return QString();
}
+QString ToolChain::explicitCodeModelTargetTriple() const
+{
+ return d->m_explicitCodeModelTargetTriple;
+}
+
+QString ToolChain::effectiveCodeModelTargetTriple() const
+{
+ const QString overridden = explicitCodeModelTargetTriple();
+ if (!overridden.isEmpty())
+ return overridden;
+ return originalTargetTriple();
+}
+
+void ToolChain::setExplicitCodeModelTargetTriple(const QString &triple)
+{
+ d->m_explicitCodeModelTargetTriple = triple;
+}
+
/*!
\class ProjectExplorer::ToolChainFactory
\brief The ToolChainFactory class creates tool chains from settings or
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 8a82c178cf..acaeabd357 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -127,6 +127,10 @@ public:
virtual QStringList includedFiles(const QStringList &flags, const QString &directory) const;
virtual QString sysRoot() const;
+ QString explicitCodeModelTargetTriple() const;
+ QString effectiveCodeModelTargetTriple() const;
+ void setExplicitCodeModelTargetTriple(const QString &triple);
+
class MacroInspectionReport
{
public:
View Lorry Controller Status