Commit fd112e41 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/master' into 4.4

Change-Id: I09a8dae9f7d66d193f382143dde915519bd329df
parents 13fc3c83 985180d3
...@@ -40,9 +40,7 @@ ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain, ...@@ -40,9 +40,7 @@ ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
isMsvc2015ToolChain isMsvc2015ToolChain
= toolChain->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor; = toolChain->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvc2015Flavor;
wordWidth = toolChain->targetAbi().wordWidth(); wordWidth = toolChain->targetAbi().wordWidth();
targetTriple = type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID targetTriple = toolChain->originalTargetTriple();
? QLatin1String("i686-pc-windows-msvc")
: toolChain->originalTargetTriple(); // OK, compiler run is already cached.
// ...and save the potentially expensive operations for later so that // ...and save the potentially expensive operations for later so that
// they can be run from a worker thread. // they can be run from a worker thread.
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "../debuggermainwindow.h" #include "../debuggermainwindow.h"
#include <projectexplorer/runconfiguration.h>
#include <QWidget> #include <QWidget>
#include <QCoreApplication> #include <QCoreApplication>
......
...@@ -97,6 +97,13 @@ bool AbstractMsvcToolChain::isValid() const ...@@ -97,6 +97,13 @@ bool AbstractMsvcToolChain::isValid() const
return fi.isFile() && fi.isExecutable(); return fi.isFile() && fi.isExecutable();
} }
QString AbstractMsvcToolChain::originalTargetTriple() const
{
return m_abi.wordWidth() == 64
? QLatin1String("x86_64-pc-windows-msvc")
: QLatin1String("i686-pc-windows-msvc");
}
ToolChain::PredefinedMacrosRunner AbstractMsvcToolChain::createPredefinedMacrosRunner() const ToolChain::PredefinedMacrosRunner AbstractMsvcToolChain::createPredefinedMacrosRunner() const
{ {
Utils::Environment env(m_lastEnvironment); Utils::Environment env(m_lastEnvironment);
......
...@@ -50,6 +50,8 @@ public: ...@@ -50,6 +50,8 @@ public:
bool isValid() const override; bool isValid() const override;
QString originalTargetTriple() const override;
PredefinedMacrosRunner createPredefinedMacrosRunner() const override; PredefinedMacrosRunner createPredefinedMacrosRunner() const override;
QByteArray predefinedMacros(const QStringList &cxxflags) const override; QByteArray predefinedMacros(const QStringList &cxxflags) const override;
CompilerFlags compilerFlags(const QStringList &cxxflags) const override; CompilerFlags compilerFlags(const QStringList &cxxflags) const override;
......
...@@ -106,6 +106,10 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject( ...@@ -106,6 +106,10 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) { if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) {
preferDebugDump = bc->buildType() == BuildConfiguration::Debug; preferDebugDump = bc->buildType() == BuildConfiguration::Debug;
setPreferDump = true; setPreferDump = true;
// Append QML2_IMPORT_PATH if it is defined in build configuration.
// It enables qmlplugindump to correctly dump custom plugins or other dependent
// plugins that are not installed in default Qt qml installation directory.
projectInfo.qmlDumpEnvironment.appendOrSet("QML2_IMPORT_PATH", bc->environment().value("QML2_IMPORT_PATH"), ":");
} }
} }
if (!setPreferDump && qtVersion) if (!setPreferDump && qtVersion)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment