Merge remote-tracking branch 'origin/4.0' into 4.1

Conflicts:
	src/shared/qbs

Change-Id: Id363df58f4f9bda5128a486e942f14179160cb86
This commit is contained in:
Eike Ziller
2016-07-05 11:15:19 +02:00
3 changed files with 33 additions and 2 deletions

View File

@@ -8,7 +8,7 @@ The standalone binary packages support the following platforms:
Windows 7 or later Windows 7 or later
(K)Ubuntu Linux 14.04 (64-bit) or later (K)Ubuntu Linux 14.04 (64-bit) or later
Mac OS X 10.7 or later macOS 10.8 or later
Building the sources requires Qt 5.5.0 or later. Building the sources requires Qt 5.5.0 or later.

31
dist/changes-4.0.3.md vendored Normal file
View File

@@ -0,0 +1,31 @@
Qt Creator version 4.0.3 contains bug fixes.
The most important changes are listed in this document. For a complete
list of changes, see the Git log for the Qt Creator sources that
you can check out from the public Git repository. For example:
git clone git://code.qt.io/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v4.0.2..v4.0.3
All Projects
* Fixed disabled run button on FreeBSD and macOS 10.8
(QTCREATORBUG-16462, QTCREATORBUG-16421)
QMake Projects
* Fixed ABI detection on NetBSD and OpenBSD
CMake Projects
* Fixed issues with opening projects from symbolic links
C++ Support
* Clang code model
* Fixed dot-to-arrow conversion being incorrectly done for
floating point literals and file suffixes (QTCREATORBUG-16188)
Test Integration
* Fixed crash when editing code while parsing for tests

View File

@@ -271,7 +271,7 @@ QString QbsRunConfiguration::baseWorkingDirectory() const
void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{ {
QbsProject *project = static_cast<QbsProject *>(target()->project()); QbsProject *project = static_cast<QbsProject *>(target()->project());
if (project) { if (project && project->qbsProject().isValid()) {
const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName); const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName);
if (product.isValid()) { if (product.isValid()) {
QProcessEnvironment procEnv = env.toProcessEnvironment(); QProcessEnvironment procEnv = env.toProcessEnvironment();