diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:28:15 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:28:15 +0100 |
| commit | 86378da3bed6ff8d89435985209e35aca3ee5700 (patch) | |
| tree | 29c47d4ab2c34816c8d4c6115534be11b9ea942f /dist | |
| parent | 39f904957a991c712d034f1c4ffc07b172fff9aa (diff) | |
| parent | 9b68aade38efa15316c6cf2193e77f9eaa2fd722 (diff) | |
| download | qt-creator-86378da3bed6ff8d89435985209e35aca3ee5700.tar.gz | |
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
src/plugins/debugger/debuggeroptionspage.cpp
Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/appdata.xml | 2 | ||||
| -rw-r--r-- | dist/changes-3.3.2 | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/dist/appdata.xml b/dist/appdata.xml index 017bbf9445..685eba7aa7 100644 --- a/dist/appdata.xml +++ b/dist/appdata.xml @@ -23,6 +23,6 @@ <screenshots> <screenshot type="default" width="800" height="600">http://qt-project.org/uploads/image_upload/qtcreator-edit-mode.png</screenshot> </screenshots> - <url type="homepage">https://qt-project.org/wiki/Category:Tools::QtCreator</url> + <url type="homepage">https://wiki.qt.io/Category:Tools::QtCreator</url> <project_group>Qt</project_group> </application> diff --git a/dist/changes-3.3.2 b/dist/changes-3.3.2 new file mode 100644 index 0000000000..a77efcd45b --- /dev/null +++ b/dist/changes-3.3.2 @@ -0,0 +1,15 @@ +Qt Creator version 3.3.2 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://gitorious.org/qt-creator/qt-creator.git +git log --cherry-pick --pretty=oneline v3.3.1..v3.3.2 + +C++ Support + * Fixed deployment of Clang code model plugin (QTCREATORBUG-14038) + +Qt Quick Designer + * Fixed crash of Qt Quick emulation layer when using fallback emulation + (QTCREATORBUG-14031) |