Commit 23d0cb31 authored by con's avatar con

Merge commit 'origin/1.1'

Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/gdbengine.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/quickopen/QuickOpen.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
parents 471d31ac 35218bbe
The QtCreator 1.1 release contains bug fixes and new features.
A more detailed list of changes follows below. If you want to know
the exact and complete list of changes, you can check out the QtCreator
sources from the public git repository and check the logs, e.g.
git clone git://labs.trolltech.com/qt-creator
git log --pretty=oneline origin/1.0.0..origin/master
A more detailed list of changes follows below. If you want to know the exact
and complete list of changes, you can check out the QtCreator sources from the
public git repository and check the logs, e.g.
The release introduces source and binary incompatible changes to the plugin API,
so if you created your own custom plugins these need to be adapted.
git clone git://labs.trolltech.com/qt-creator
git log --pretty=oneline v1.0.0..v1.1.0
General
* Completely reworked editor split mechanism.
* Supports cmake project
* Support generic Makefile based projects
This release introduces source and binary incompatible changes to the plugin
API, so if you created your own custom plugins these need to be adapted.
Editing
* Added support for JavaScript.
* Added syntax highlighting and code completion for qdoc and doxygen tags.
* Improved function argument hint.
* More checkpoints in editor history.
* Ctrl-click for jumping to a symbol definition.
* Improved open documents view (sorted, single-click, close buttons).
* Copying text from the context help browser and output windows didn't work.
* Completely reworked editor split mechanism
* Added support for JavaScript
* Added syntax highlighting and code completion for qdoc and doxygen tags
* Improved function argument hint
* Added more checkpoints in editor history
* Added Ctrl-click for jumping to a symbol definition
* Improved open documents view (sorted, single-click, close buttons)
* Fixed copying text from the context help browser and output windows
* Improved FakeVim mode
* Improved C++ parsing and inline error indicators
Building and Running
* Experimental support for generic Makefile based projects.
* Improved .pro file parsing, handling scopes and $$system directive.
* Support subdir.file in .pro files.
* Option to start application in external terminal.
* Added experimental support for generic Makefile based projects
* Improved .pro file parsing, handling scopes and $$system directive
* Added support for subdir.file in .pro files
* Added an option to start the application in an external terminal
* Improved CMake support
Debugging
* Possibility to attach debugger to core files.
* Made it possible to attach debugger to core files
* Changed approach to dumper loading: Build once per used Qt version,
no dumper buildstep anymore.
* New dumper for std::set. Improved QString, QVariant, std::wstring
* Make strategy to load shared objects configurable (auto-solib-add).
* Increase number of shown stack frames on request instead of loading them all.
* Improved interaction in the Locals&Watchers view.
no dumper buildstep anymore
* Added a dumper for std::set and improved dumpers for QString, QVariant,
std::wstring
* Made strategy to load shared objects configurable (auto-solib-add)
* The number of shown stack frames is now increased on request instead of
loading them all
* Improved interaction in the Locals & Watchers view
Wizards
* It is now possible to choose file suffixes in the options dialog.
* Code of language change event is now generated correctly (added call
to base class).
* Generated header guards now adapt to file extension.
* It is now possible to choose default file suffixes in the options dialog
* Fixed the code that was generated for handling a language change event
(added call to base class)
* Generated header guards now adapt to file extension
Designer
* Added signal/slot editor.
* Fixed "Goto slot" (formatting/multiple inheritance).
* Context help for form editor widgets.
* Added signal/slot editor
* Fixed "Goto slot" (formatting/multiple inheritance)
* Context help for form editor widgets
Version control plugins
* Fixed handling of colored git output.
* Made svn 1.6 work.
* Added syntax highlighting to the git submit editor.
* Made git submit editor remove comment lines.
* Fixed handling of colored git output
* Added syntax highlighting to the git submit editor
* Made git submit editor remove comment lines
* Made Subversion 1.6 work
* Added configuration options for submit editors (user fields, word
wrapping).
wrapping)
Platform Specific
Mac
* Don't override systems Hide action.
* Option to set DYLD_IMAGE_SUFFIX=_debug when running applications.
* Open in Finder action in project tree.
* The system's Hide action is no longer overridden
* Added option to set DYLD_IMAGE_SUFFIX=_debug when running applications
* Added Open in Finder action in project tree
Linux
* Don't crash because of incompatible libQt3Support:
Provide a wrapper script and ship libQt3Support.
(Fixes crashes e.g. in file dialogs on openSUSE 11.1)
* Fixed crash because of incompatible libQt3Support, by providing a wrapper
script and shipping libQt3Support.
(fixes crashes e.g. in file dialogs on openSUSE 11.1)
Lots of improvements to
* FakeVim mode
* CMake support
* C++ parsing and inline error indicators
* Everything :-)
Additional credits go to:
* Martin Aumueller <aumuell@reserv.at> (FakeVim improvements)
* Kris Wong (various patches)
* Mathias Gumz (fixed permission checks on network NTFS drives)
......@@ -110,8 +110,9 @@ QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QStrin
QString buildDirectoryPath = buildDirectory.absolutePath();
qDebug()<<"Creating cbp file in"<<buildDirectoryPath;
buildDirectory.mkpath(buildDirectoryPath);
QProcess * cmake = new QProcess;
QProcess *cmake = new QProcess;
cmake->setWorkingDirectory(buildDirectoryPath);
cmake->setProcessChannelMode(QProcess::MergedChannels);
#ifdef Q_OS_WIN
QString generator = "-GCodeBlocks - MinGW Makefiles";
......
......@@ -604,6 +604,13 @@ CPPEditor::Link CPPEditor::findLinkAt(const QTextCursor &cursor,
QTextCursor tc = cursor;
// Make sure we're not at the start of a word
{
const QChar c = characterAt(tc.position());
if (c.isLetter() || c == QLatin1Char('_'))
tc.movePosition(QTextCursor::Right);
}
static TokenUnderCursor tokenUnderCursor;
QTextBlock block;
......
......@@ -8,6 +8,8 @@ include(../../qworkbenchlibrary.pri)
linux-* {
CONFIG -= release
CONFIG += debug
# The following line works around a linker issue with gcc 4.1.2
QMAKE_CXXFLAGS *= -O2
}
SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
......
......@@ -3173,7 +3173,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
sendWatchParameters(params);
QString cmd ="call "
+ QString("qDumpObjectData440(")
+ QString("(void*)qDumpObjectData440(")
+ QString::number(protocol)
+ ',' + "%1+1" // placeholder for token
+ ',' + addr
......@@ -3469,7 +3469,7 @@ void GdbEngine::sendWatchParameters(const QByteArray &params0)
QByteArray params = params0;
params.append('\0');
char buf[50];
sprintf(buf, "set {char[%d]} qDumpInBuffer = {", params.size());
sprintf(buf, "set {char[%d]} &qDumpInBuffer = {", params.size());
QByteArray encoded;
encoded.append(buf);
for (int i = 0; i != params.size(); ++i) {
......@@ -4177,14 +4177,14 @@ void GdbEngine::tryLoadDebuggingHelpers()
sendCommand("sharedlibrary " + dotEscape(lib));
#endif
// retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}
void GdbEngine::recheckDebuggingHelperAvailability()
{
// retreive list of dumpable classes
sendCommand("call qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("call (void*)qDumpObjectData440(1,%1+1,0,0,0,0,0,0)");
sendCommand("p (char*)&qDumpOutBuffer", GdbQueryDebuggingHelper);
}
......
......@@ -1554,7 +1554,7 @@ void ProjectExplorerPlugin::updateRecentProjectMenu()
const QPair<QString, QString> &s = *it;
if (s.first.endsWith(".qws"))
continue;
QAction *action = menu->addAction(s.second);
QAction *action = menu->addAction(s.first);
action->setData(s.first);
connect(action, SIGNAL(triggered()), this, SLOT(openRecentProject()));
}
......
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