Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/4.0' into 4.1
Browse files Browse the repository at this point in the history
 Conflicts:
	src/shared/qbs

Change-Id: Id363df58f4f9bda5128a486e942f14179160cb86
  • Loading branch information
e4z9 committed Jul 5, 2016
2 parents 71e3833 + ce4ddcb commit 57c2c59
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The standalone binary packages support the following platforms:

Windows 7 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.

Expand Down
31 changes: 31 additions & 0 deletions dist/changes-4.0.3.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ QString QbsRunConfiguration::baseWorkingDirectory() const
void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{
QbsProject *project = static_cast<QbsProject *>(target()->project());
if (project) {
if (project && project->qbsProject().isValid()) {
const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName);
if (product.isValid()) {
QProcessEnvironment procEnv = env.toProcessEnvironment();
Expand Down

0 comments on commit 57c2c59

Please sign in to comment.