diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
| commit | 8f9861cd0965353834b2dcd866c19fd502ecda5e (patch) | |
| tree | 8275f90466439c1ccf0dae132164751562b32963 /dist | |
| parent | e8241adae3aa160aa2e119f16f9a4b8afcdc480e (diff) | |
| parent | 4345fc8c36c4df74ab05a07cf6fa073081b96d26 (diff) | |
| download | qt-creator-8f9861cd0965353834b2dcd866c19fd502ecda5e.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
qtcreator.pro
src/plugins/qtsupport/debugginghelperbuildtask.h
Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-2.4.1 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dist/changes-2.4.1 b/dist/changes-2.4.1 index 8e1dcee2ab..8edabc9353 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 @@ -27,14 +28,19 @@ QML/JS Support 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 |