From 4345fc8c36c4df74ab05a07cf6fa073081b96d26 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Mon, 23 Jan 2012 17:07:10 +0100
Subject: [PATCH] Update changes file.
Change-Id: I83d9313f56b8ef161d73ba263abf2711d6397486
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
---
dist/changes-2.4.1 | 9 +++++++--
qtcreator.pro | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dist/changes-2.4.1 b/dist/changes-2.4.1
index 59c422003d2..8edabc93535 100644
--- a/dist/changes-2.4.1
+++ b/dist/changes-2.4.1
@@ -5,13 +5,14 @@ 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://gitorious.org/qt-creator/qt-creator.git
-git log --cherry-pick --pretty=oneline v2.4.0..origin/2.4
+git log --cherry-pick --pretty=oneline v2.4.0..v2.4.1
General
Editing
Managing Projects
+ * Fix a crash on closing a project while a parse is in progress (QTCREATORBUG-6677)
Debugging
@@ -23,19 +24,23 @@ C++ Support
QML/JS Support
* Search qmlplugindump (4.8) in right location (QTCREATORBUG-6698)
- * Find QMLViewer.app even if filesystem is case sensitive (QTCREATORBUG-5975)
Qt Quick Designer
Help
+ * Fix loading of files from documentation (QTSDK-1129)
Platform Specific
Mac
+ * Only force mkspec with specific gcc version if the compiler path suggests it
+ * Find QMLViewer.app even if filesystem is case sensitive (QTCREATORBUG-5975)
+ * Build debugging helper with correct architecture (QTCREATORBUG-6737)
Linux (GNOME and KDE)
Windows
+ * Fix getting proxy settings
Symbian Target
diff --git a/qtcreator.pro b/qtcreator.pro
index 3e15415c766..f2074a71fe8 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -27,4 +27,5 @@ OTHER_FILES += dist/copyright_template.txt \
dist/changes-2.2.0 \
dist/changes-2.3.0 \
dist/changes-2.3.1 \
- dist/changes-2.4.0
+ dist/changes-2.4.0 \
+ dist/changes-2.4.1
--
GitLab