Commit e5ca4b34 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
parents ab8713d7 dbc0fa09
......@@ -8,8 +8,9 @@ git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.2.1...origin/2.3
General
* Welcome page redesign allows searching through examples with descriptions
* Restore previous size when unmaximizing output panes
* Redesigned the Welcome page to allow searching through examples with
descriptions
* Fixed Output panes so that they are minimized to their previous size
* Added support for building with the Clang compiler
Editing
......@@ -22,9 +23,34 @@ Debugging
* Color memory display highlighting the variables in stack layout
* Correct source location for breakpoints in CDB using code model
(QTCREATORBUG-2317)
* Added support for multiple breakpoints from one location
(covering constructors, destructors, template functions, and so on)
* Added a custom dumper for QXmlAttributes, Eigen::Matrix
* Added the option to set data breakpoints on either an address or expression
* Added a framework to modify strings, vectors, and so on, during debugging
* Added an option to stop on qWarning
* Renamed "Locals and Watchers" as "Locals and Expressions"
* Renamed "Watchpoint" as "Data Breakpoints"
* Made original values of automatically dereferenced pointers accessible
* Improved the "Add Breakpoint" dialog
* Improved the displaying of enums (included numeric value)
* Improved the speed of the QVariant dumper
* Improved the handling of shadowed local variables
* Fixed object expansion in tooltip
* Fixed std::deque dumper (QTCREATORBUG-4936)
* Fixed the handling of watched expressions with unusual characters
* Fixed "Run To Line" on Mac (QTCREATORBUG-4619)
* Fixed output parsing for data breakpoints on Mac (QTCREATORBUG-4797)
* Fixed auto-continue on SIGTRAP (QTCREATORBUG-4968)
* Fixed the dumper for gcc 4.4's std::map
Debugging QML/JS
Analyzing Code
* Redesigned the framework code
* Added support for QML profiling
* Added support for the Valgrind Callgrind tool on Linux and Mac
C++ Support
* Made C++ coding style configurable (QTCREATORBUG-2670, QTCREATORBUG-4310,
QTCREATORBUG-2763, QTCREATORBUG-3623, QTCREATORBUG-567)
......@@ -47,6 +73,26 @@ QML/JS Support
* Fixed scanning and indentation of regular expression literals (QTCREATORBUG-4566)
* Fixed indentation of object literals
Qt Quick Designer
* Added tool buttons to the navigator for reordering and reparenting of items
* Added support for import as (QTCREATORBUG-4087)
* Added editing and navigation for inline components
* Added support for models and delegates in the current file (QTCREATORBUG-4528)
* Added support for repeaters (QTCREATORBUG-4852)
* Added context menu for resetting postion and size
* Added context menu for improved selection (QTCREATORBUG-4611)
* Added translation support for text items
* Added context menu for z-order (QTCREATORBUG-2522)
* Fixed z-order in the form editor (QTCREATORBUG-5226)
* Improved usability of the form editor (QTCREATORBUG-4820 QTCREATORBUG-4819)
* Do not enforce clipping of items in the form editor anymore
* Improved property editor for mouse area (QTCREATORBUG-4927)
* Use the qmlpuppet from current Qt if availabe (QTCREATORBUG-4824)
* Added project for qmlpuppet in share of Qt Creator
* Fixed copy and paste bug (QTCREATORBUG-4581)
* Fixed scoping of root item properties (QTCREATORBUG-4574)
* Improved property editor for ListView, GridView and PathView
Help
Platform Specific
......@@ -72,6 +118,12 @@ Remote Linux Support
Qt Designer
FakeVim:
* Made FakeVim functionality available for shortcuts in normal text editor
* Added snippet support
* Fixed behaviour of Ctrl keys on Mac
* Fixed searching for expressions containing '|' (QTCREATORBUG-4752)
Version control plugins
* Git: Manage remote repositories
* Git: Improved branch dialog
......
......@@ -13,7 +13,7 @@ include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf)
sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc qtcreator-faq.qdoc"
sources.fileextensions = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressbook-sdk.qdoc qtcreator-faq.qdoc linuxdev.qdoc"
qhp.projects = QtCreator
......
......@@ -83,5 +83,5 @@ OTHER_FILES = $$HELP_DEP_FILES $$DEV_HELP_DEP_FILES
fixnavi.commands = \
cd $$targetPath($$PWD) && \
perl fixnavi.pl -Dqcmanual -Dqtquick \
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc
qtcreator.qdoc maemodev.qdoc symbiandev.qdoc qtcreator-faq.qdoc linuxdev.qdoc
QMAKE_EXTRA_TARGETS += fixnavi
doc/images/qml-observer-view.png

14.9 KB | W: | H:

doc/images/qml-observer-view.png

21.3 KB | W: | H:

doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qmldesigner-element-size.png

15.7 KB | W: | H:

doc/images/qmldesigner-element-size.png

18.7 KB | W: | H:

doc/images/qmldesigner-element-size.png
doc/images/qmldesigner-element-size.png
doc/images/qmldesigner-element-size.png
doc/images/qmldesigner-element-size.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qmldesigner-navigator.png

7.21 KB | W: | H:

doc/images/qmldesigner-navigator.png

9.37 KB | W: | H:

doc/images/qmldesigner-navigator.png
doc/images/qmldesigner-navigator.png
doc/images/qmldesigner-navigator.png
doc/images/qmldesigner-navigator.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-analyze-menu.png

12.9 KB | W: | H:

doc/images/qtcreator-analyze-menu.png

5.95 KB | W: | H:

doc/images/qtcreator-analyze-menu.png
doc/images/qtcreator-analyze-menu.png
doc/images/qtcreator-analyze-menu.png
doc/images/qtcreator-analyze-menu.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-analyze-start-button.png

955 Bytes | W: | H:

doc/images/qtcreator-analyze-start-button.png

920 Bytes | W: | H:

doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
doc/images/qtcreator-analyze-start-button.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-analyzer-button.png

897 Bytes | W: | H:

doc/images/qtcreator-analyzer-button.png

847 Bytes | W: | H:

doc/images/qtcreator-analyzer-button.png
doc/images/qtcreator-analyzer-button.png
doc/images/qtcreator-analyzer-button.png
doc/images/qtcreator-analyzer-button.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment