Commit 66c2c7c1 authored by con's avatar con
Browse files

Add the environment from the right tool chain.

Since the actual tool chain is defined in the project, it
moved there from the qt version.
parent 3c4122b8
* When the refresh button in the SDK option page is pressed
the qtoptionspage is not updated to reflect the new versions
though we update them in S60Manager
* SDK overview page:
* When the refresh button is pressed
the qtoptionspage is not updated to reflect the new versions
though we update them in S60Manager
* Qt auto-detection fails if no winscw-udeb Qt libs are installed
* QtVersion:
* support the different tool chains
......
......@@ -724,6 +724,7 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
{
Environment env = useSystemEnvironment(buildConfiguration) ? Environment::systemEnvironment() : Environment();
qtVersion(buildConfiguration)->addToEnvironment(env);
toolChain(buildConfiguration)->addToEnvironment(env);
return env;
}
......
......@@ -1083,12 +1083,6 @@ void QtVersion::addToEnvironment(ProjectExplorer::Environment &env) const
env.set("QTDIR", m_path);
QString qtdirbin = versionInfo().value("QT_INSTALL_BINS");
env.prependOrSetPath(qtdirbin);
// add libdir, includedir and bindir
// or add Mingw dirs
// or do nothing on other
ProjectExplorer::ToolChain *tc = toolChain(defaultToolchainType());
if (tc)
tc->addToEnvironment(env);
}
int QtVersion::uniqueId() const
......@@ -1195,7 +1189,9 @@ QString QtVersion::buildDebuggingHelperLibrary()
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
addToEnvironment(env);
// TODO: the debugging helper doesn't comply to actual tool chain yet
ProjectExplorer::ToolChain *tc = toolChain(defaultToolchainType());
tc->addToEnvironment(env);
QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, path());
QString output = DebuggingHelperLibrary::buildDebuggingHelperLibrary(directory, tc->makeCommand(), qmakeCommand(), mkspec(), env);
m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
......
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