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