Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -67,6 +67,7 @@ Runnable QmlProjectRunConfiguration::runnable() const
     r.executable = executable();
     r.commandLineArguments = commandLineArguments();
     r.runMode = ApplicationLauncher::Gui;
+    r.environment = extraAspect<QmlProjectEnvironmentAspect>()->environment();
     r.workingDirectory = canonicalCapsPath(target()->project()->projectFilePath()
                                            .toFileInfo().absolutePath());
     return r;