Commit 81cce890 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
parents 2ee0b363 5dcf7d2e
This diff is collapsed.
......@@ -19,13 +19,28 @@ Editing
Managing Projects
* Shared project settings support
* New templates for non-Qt C and C++ applications
Debugging
* Initial Qt 5 support in dumpers
* Make vtables visible
* Improved remote debugging
* Improved register handling (partial updates, input in hex, ARM Neon support)
* Remove inferior calls in QDate, QTime, QDateTime dumpers
* Fix QTextCodec dumpers
* Globally enable pretty printing for references
* Saner handling of unprintable data in Locals and Expressions
* Add "Local8Bit" as display option for char arrays and pointers
Debugging QML/JS
* New option to attach to a running application
* Lots of bug fixes especially for debugging in combination with C++
* Initial support for debugging JS in Qt 5 (v8 engine)
Analyzing Code
* Standalone qmlprofiler command line tool allows you to retrieve & store QML tracing data
* Ability to store and load traces in a file
* New option to attach to a running application
C++ Support
* Add quick fix to synchronize function declarations and definitions
......@@ -67,6 +82,7 @@ QML/JS Support
* Fix scope for completion in code bindings
* Allow for different builtin type information per Qt version
* Update builtin type information and parser for Qt 5
* Use qmlscene for previewing files in Qt 5
Qt Quick Designer
* Adding breadcrumb navigation for components
......@@ -88,12 +104,32 @@ Windows
Symbian Target
Remote Linux Support
* Move Maemo/MeeGo support into its own plugin.
* Assume less about the target systems, e.g. in respect to the presence of
POSIX-conforming tools.
Qt Designer
FakeVim
* Add basic command editing in Ex mode
* Mention "comma escape" in Documentation
* Fix foreground color for search matches in Dark scheme
* Fix toggling visual mode with "v"
Version control plugins
* SVN: Support for SVN version 1.7
* Git: New option to toggle decoration settings for log and show commands
Additional credits go to:
* Benito van der Zander (code model)
* Christoph Mathys (debugger)
* Hugues Delorme (version control refactoring, bazaar)
* Jonathan Liu (SVN 1.7 support)
* Nicolas Arnaud-Cormos (quick fixes)
* Orgad Shaneh (git, debugger, other places)
* Peter Kuemmel (bug fixes)
* Thorbjørn Lindeijer (code model)
* Vlad Brovko (improve symlink support)
* Yuchen Deng (bug fixes, project wizards)
......@@ -59,12 +59,11 @@
\section1 Submitting Code
To submit code to Qt, you must understand the tools and mechanics as well as
To submit code to Qt Creator, you must understand the tools and mechanics as well as
the philosophy behind Qt development. For more information about how to set up
the development environment for working on a Qt library and how to submit code
and documentation for inclusion to Qt, see
\l{http://developer.qt.nokia.com/wiki/Qt_Contribution_Guidelines}
{Guidelines for Contributions to the Qt Framework}.
the development environment for working on Qt Creator and how to submit code
and documentation for inclusion, see
\l{http://wiki.qt-project.org/index.php/Main_Page}{Guidelines for Contributions to the Qt Project}.
\section1 Binary and Source Compatibility
......@@ -85,28 +84,23 @@
We do not currently guarantee API nor ABI
(\l{http://en.wikipedia.org/wiki/Application_binary_interface}{application binary interface})
compatibility between major releases.
compatibility between major releases and minor releases.
However, we try to preserve compatibility between minor and patch releases,
as follows:
However, we try to preserve backward and forward binary compatibility and forward and
backward source code compatibility in patch releases, so:
\list
\o Preserve backward binary compatibility and backward source code
compatibility in minor releases.
\o Preserve backward and forward binary compatibility and forward and
backward source code compatibility in patch releases:
\list
\o Do not add or remove any public API (e.g. global functions,x
public/protected/private methods).
\o Do not reimplement methods (not even inlines,
nor protected or private methods).
\o Check
\l {http://developer.qt.nokia.com/wiki/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds}
for ways to preserve binary compatibility.
\endlist
\o Do not add or remove any public API (e.g. global functions,x
public/protected/private methods).
\o Do not reimplement methods (not even inlines,
nor protected or private methods).
\o Check
\l {http://wiki.qt-project.org/index.php/Binary_Compatibility_Workarounds}{Binary Compatibility Workarounds}
for ways to preserve binary compatibility.
\endlist
\note This is not yet mandatory.
For more information on binary compatibility, see
\l{http://techbase.kde.org/Policies/Binary_Compatibility_Issues_With_C++}{Binary Compatibility Issues With C++}.
......@@ -502,7 +496,7 @@
\section2 Namespacing
Read \l {http://developer.qt.nokia.com/wiki/Qt_In_Namespace}{Qt In Namespace}
Read \l {http://wiki.qt-project.org/index.php/Qt_In_Namespace}{Qt In Namespace}
and keep in mind that all of Qt Creator is \e{namespace aware} code.
The namespacing policy within Qt Creator is as follows:
......
......@@ -215,11 +215,11 @@
file, which is then opened within Qt Creator. You provide
an editor (probably read-only) for handling this file.
For lists of issues, consider creating task list files which are shown in
the \gui {Build Issues} output
the \gui {Issues} output
pane.
\list
\o \l{http://doc.qt.nokia.com/qtcreator/creator-task-lists.html}
{Showing Task List Files in the Build Issues Pane}
{Showing Task List Files in the Issues Pane}
\o \l{Creating Plugins}
\o \l{Qt Creator Coding Rules}
\o \l{Menus and Menu Items}
......
doc/images/qtcreator-add-resource.png

33.5 KB | W: | H:

doc/images/qtcreator-add-resource.png

30.5 KB | W: | H:

doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-breakdown.png

180 KB | W: | H:

doc/images/qtcreator-breakdown.png

162 KB | W: | H:

doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-edit-mode.png

102 KB | W: | H:

doc/images/qtcreator-edit-mode.png

70.9 KB | W: | H:

doc/images/qtcreator-edit-mode.png
doc/images/qtcreator-edit-mode.png
doc/images/qtcreator-edit-mode.png
doc/images/qtcreator-edit-mode.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-formedit.png

147 KB | W: | H:

doc/images/qtcreator-formedit.png

137 KB | W: | H:

doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-help-search.png

171 KB | W: | H:

doc/images/qtcreator-help-search.png

104 KB | W: | H:

doc/images/qtcreator-help-search.png
doc/images/qtcreator-help-search.png
doc/images/qtcreator-help-search.png
doc/images/qtcreator-help-search.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