From 30fda789d5ce33e7c481e125eb71f3ca27de3adc Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 30 Jun 2016 13:53:35 +0200 Subject: [PATCH 1/4] Precompiled binaries no longer support macOS 10.7 Since we compile with Qt 5.7, macOS 10.8 is the minimum requirement for the binary packages. Change-Id: Id9a08739e8f720399960735fd3b2072320f154fe Reviewed-by: Jake Petroules --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b416359b02..d48d5df651c 100644 --- a/README.md +++ b/README.md @@ -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. From 5088bed3f8433a8abeda03f9415c9fd71527f503 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 1 Jul 2016 10:54:03 +0200 Subject: [PATCH 2/4] Add change log for 4.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie7b27f2cc8ea1afad07d402aa3e68dc8bfa9116f Reviewed-by: Topi Reiniö Reviewed-by: Eike Ziller --- dist/changes-4.0.3.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 dist/changes-4.0.3.md diff --git a/dist/changes-4.0.3.md b/dist/changes-4.0.3.md new file mode 100644 index 00000000000..0fa86c117ca --- /dev/null +++ b/dist/changes-4.0.3.md @@ -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 From fdb764b24b746624ea47de8bec4a81af16aca038 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 1 Jul 2016 16:55:02 +0200 Subject: [PATCH 3/4] QbsProjectManager: Fix crash on Kit update Before accessing qbs::Project methods, we need to check whether this object is valid. Change-Id: I6c54f5b1118a3960b4814af647d81f5786fa452d Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 8a028278037..074f1ad4c66 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -270,7 +270,7 @@ QString QbsRunConfiguration::baseWorkingDirectory() const void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const { QbsProject *project = static_cast(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(); From ce4ddcb060f173ca78b86e349165ea0aa32ac0b4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 4 Jul 2016 11:40:48 +0200 Subject: [PATCH 4/4] Update qbs submodule To HEAD of 1.5 branch. Change-Id: Ib42ba2dcf30bbe8ad2b088cab1649da7375d5cd6 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index d8d7beb866b..33e9cd462a6 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit d8d7beb866b24793d9c04b6996276a4a8959bfa2 +Subproject commit 33e9cd462a6c7b6dc552669361f4321ffdb22ff3