diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
| commit | 2786250c172138c1ece456305264f7b5039b8f2a (patch) | |
| tree | dd0a56d98aefe9e1c6a3042b5cbcc37e87bd903b /dist | |
| parent | e9d433a99a8fa4769df92f9caaaaaec049596c34 (diff) | |
| parent | 27cc89eb4a1e157c68793718602416448547de20 (diff) | |
| download | qt-creator-2786250c172138c1ece456305264f7b5039b8f2a.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-3.1.2 | 52 | ||||
| -rw-r--r-- | dist/installer/mac/ios_qt.conf | 3 |
2 files changed, 52 insertions, 3 deletions
diff --git a/dist/changes-3.1.2 b/dist/changes-3.1.2 new file mode 100644 index 0000000000..36973e1539 --- /dev/null +++ b/dist/changes-3.1.2 @@ -0,0 +1,52 @@ +Qt Creator version 3.1.2 is a bugfix release. + +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://gitorious.org/qt-creator/qt-creator.git +git log --cherry-pick --pretty=oneline v3.1.1..v3.1.2 + +General + * Fixed restoring of output pane button visibility + +Editing + * Fixed crash with highlight definitions and indentation based folding enabled + (QTCREATORBUG-12172) + * Fixed setting current file when clicking on split view (QTCREATORBUG-12264) + +Help + * Fixed that pressing F1 twice would not go to Help mode + (QTCREATORBUG-9093) + * Fixed filtering in topic chooser + +QMake Projects + * Fixed adding files through context menu in case of multiple + resource files (QTCREATORBUG-12297) + * Fixed that resource files were no longer appearing in + Locator and search + +Debugging + * GDB + * Worked around GDB crash with large object names + (QTCREATORBUG-12330) + +C++ Support + * Fixed crash with anonymous unions with __attribute__ + (QTCREATORBUG-12345) + +Code Paster + * Fixed crash in case of invalid protocol setting (QTCREATORBUG-12364) + +Beautifier + * Fixed problem on Mac when starting Qt Creator from Finder + (QTCREATORBUG-12057) + +Platform Specific + +Windows + * Fixed matching of paths in Locator (QTCREATORBUG-12007) + +QNX + * Fixed font path on devices + diff --git a/dist/installer/mac/ios_qt.conf b/dist/installer/mac/ios_qt.conf index 11b9a3ab64..9e239d6193 100644 --- a/dist/installer/mac/ios_qt.conf +++ b/dist/installer/mac/ios_qt.conf @@ -1,5 +1,2 @@ [Paths] -# prefix must be one up because Qt makes it relative to the app's Contents/ path, -# even if that doesn't exist! -Prefix = .. Plugins = ../../PlugIns |