Commit 85cf2b66 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/2.4'

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
parents 920ed114 d099d685

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -10,12 +10,12 @@ Windows 7, Windows XP SP2, Windows Vista
(K)Ubuntu Linux 8.04 (32-bit and 64-bit) or later
Mac OS 10.5 or later
Building the sources requires Qt 4.7.1 or later.
Building the sources requires Qt 4.7.4 or later.
Compiling Qt Creator
====================
Prerequisites:
* Qt 4.7.1
* Qt 4.7.4
* On Windows:
- ActiveState Active Perl (version 5.8.9 for Symbian development)
- MinGW 4.4 or later, Visual Studio 2008 or later
......@@ -36,7 +36,7 @@ Compiling Qt Quick Designer
---------------------------
Qt Quick Designer (QmlDesigner plugin) depends on "private" headers from Qt
4.7.1, specifically from the QtDeclarative module. These private headers always
4.7.4, specifically from the QtDeclarative module. These private headers always
end with an "_p.h". Nokia does not promise to keep these files or APIs binary
or source compatible between releases. This means that when compiled, the
plugin has a dependency to the exact Qt version it was compiled with. Running
......@@ -277,7 +277,7 @@ we thank the authors who made this possible:
All rights reserved.
Copyright (c) 2010 Denis Mingulov.
Contact: Nokia Corporation (info@qt.nokia.com)
Contact: Nokia Corporation (qt-info@nokia.com)
This file is part of Qt Creator.
......
......@@ -8,50 +8,51 @@ git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.3.1...origin/2.4
General
* Showing more useful error dialog in case of plugin errors
* Reduce minimum size of preferences dialog
* Improve the error message that appears when plugin errors occur
* Decrease the minimum size of the Options dialog
Editing
* Advanced search: Show more information about the search parameters
* Advanced search: Move the previously modal dialog into search results pane
* Advanced search: Keep a history of most recent searches and their results
* Code Style schemas implemented, you can reuse them in different projects now
* Advanced search: Move the previously modal dialog into the search results pane
* Advanced search: Keep a history of the most recent searches and their results
* Implement code style schemas for reuse in different projects
Managing Projects
* Shared project settings support
* New templates for non-Qt C and C++ applications
* Support the sharing of project settings
* Add new project wizards for non-Qt C and C++ applications
Debugging
* Initial Qt 5 support in dumpers
* Add initial Qt 5 support in dumpers
* Make vtables visible
* Improved remote debugging
* Improved register handling (partial updates, input in hex, ARM Neon support)
* Improve remote debugging
* Improve 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
* Improve handling of unprintable data in Locals and Expressions
* Add 'Local8Bit' as a display option for char arrays and pointers
Debugging QML/JS
* New option to attach to a running application
* Add the 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)
* Add 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
* Retrieve and store QML tracing data by using the standalone qmlprofiler
command line tool
* Store and load traces in a file
* Add the option to attach to a running application
C++ Support
* Add quick fix to synchronize function declarations and definitions
* Add the refactoring action to synchronize function declarations and definitions
* Make 'insert definition from declaration' use minimally qualified names
and find a good insertion location next to surrounding declarations
* Fix completion for typedefs for templates in namespaces
* Use minimally qualified names in function signature completion
* Use minimally qualified names in 'insert local declaration' quick fix
* When switching between header/source, prefer files in the same directory
* Fix problem with encoding and quick fixes (QTCREATORBUG-6140)
* Fix preservation of indentation level in comments with tabs (QTCREATORBUG-6151)
* Use minimally qualified names in 'insert local declaration' refactoring action
* Prefer files in the same directory when switching between the header and source
* Fix the problem with encoding and quick fixes (QTCREATORBUG-6140)
* Fix the preservation of indentation level in comments with tabs (QTCREATORBUG-6151)
* Improve performance for files with a huge number of literals
QML/JS Support
......@@ -60,22 +61,22 @@ QML/JS Support
* Add semantic highlighting
* Significantly improve scanning of C++ documents for qmlRegisterType and
setContextProperty calls (QTCREATORBUG-3199)
* Add warning about inappropriate use of constructor functions
* Add warning about unreachable code
* Add a warning about inappropriate use of constructor functions
* Add a warning about unreachable code
* Add support for .import directive in js files
* Add completion for XMLHttpRequest, DB API and JSON.
* Add 'length' property to functions
* Add the 'length' property to functions
* Use mime types to distinguish qml and js files
* Show the function argument hint for signals
* When completing enums, add qualified names instead of strings
* Honor typeinfo lines in qmldir files
* Make string literals that contain file names into links (QTCREATORBUG-5701)
* Add warning about invalid types in 'property' declarations (QTCREATORBUG-3666)
* Fix highlighting of property types (QTCREATORBUG-6127)
* Fix 'follow symbol' for local variables (QTCREATORBUG-6094)
* Add a warning about invalid types in 'property' declarations (QTCREATORBUG-3666)
* Fix the highlighting of property types (QTCREATORBUG-6127)
* Fix the 'follow symbol' functionality for local variables (QTCREATORBUG-6094)
* Fix function argument hints on variables (QTCREATORBUG-5752)
* Fix completion for enums in a different scope
* Fix typing '/' triggering a global completion
* Fix the completion for enums in a different scope
* Fix typing a slash (/) triggering a global completion
* Fix handling of meta object revision in C++ QML plugins
* Fix indentation of block property initializers
* Fix indentation of labelled statements
......@@ -85,40 +86,40 @@ QML/JS Support
* Use qmlscene for previewing files in Qt 5
Qt Quick Designer
* Adding breadcrumb navigation for components
* Adding layout functionality to context menu.
* Add breadcrumb navigation for components
* Add layout functionality to context menu
Help
Platform Specific
Mac
* "Run in Terminal" was not finding xterm by default
* Fix 'Run in Terminal' so that it finds xterm by default
Linux (GNOME and KDE)
Windows
* Aborting the build now works properly. Qt Creator sends Ctrl-C to the
build process via the process_ctrlc_stub helper program.
* Fix aborting the build, so that Qt Creator sends Ctrl-C to the
build process via the process_ctrlc_stub helper program
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.
* Move Maemo and MeeGo support into its own plugin
* Assume less about the target systems, for example, in respect to the
presence of POSIX-conforming tools.
Qt Designer