...
 
Commits (28)
......@@ -34,6 +34,9 @@ Debugging
* CDB: Fixed disassembler for 64 bit addresses
* Fixed finding the file for build issues when mingw32-make is used
* Ignore case of file name in breakpoint handling on Windows
* Fixed problems with gdb timing out and debugging sessions unexpectedly finishing
* Improved startup time of gdb sessions by not asking for all files known to gdb
* Mac: Fixed problems with locals and watchers not updating correctly on Snow Leopard
Help
* Don't switch to Help mode if help side bar is already visible
......
......@@ -11,7 +11,7 @@
\title Qt Creator Manual
\section1 Version 1.3.0
\section1 Version 1.3.1
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
......@@ -1464,7 +1464,7 @@
specified in the \c CMake project file.
Known issues for the current version can be found
\l{Known Issues of version 1.3.0}{here}.
\l{Known Issues of version 1.3.1}{here}.
*/
......@@ -2033,7 +2033,7 @@
There are some known issues with Qt Creator.
The development team is aware of them, there is no need to report them as bugs.
\section1 Known Issues of Version 1.3.0
\section1 Known Issues of Version 1.3.1
\list
\o Debugging Helper does not work while performing On-Device Debugging.
......
......@@ -19,16 +19,16 @@ sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.130
qhp.QtCreator.namespace = com.nokia.qtcreator.131
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png \
images/qtcreator-screenshots.png
qhp.QtCreator.filterAttributes = qtcreator 1.3.0
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.0
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.0
qhp.QtCreator.filterAttributes = qtcreator 1.3.1
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.1
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.1
# macros.qdocconf
......@@ -211,5 +211,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"40%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
"<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
"<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.3.0</div></td>\n" \
"<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.3.1</div></td>\n" \
"</tr></table></div></address>"
......@@ -184,8 +184,8 @@
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string>
<key>CFBundleVersion</key>
<string>1.3.0</string>
<string>1.3.1</string>
<key>CFBundleShortVersionString</key>
<string>1.3.0</string>
<string>1.3.1</string>
</dict>
</plist>
<plugin name="BinEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="BinEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Binary editor component.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -297,12 +297,11 @@ class BinEditorInterface : public Core::IEditor
{
Q_OBJECT
public:
BinEditorInterface(BinEditor *parent)
: Core::IEditor(parent)
BinEditorInterface(BinEditor *editor)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_editor = parent;
m_file = new BinEditorFile(parent);
m_editor = editor;
m_file = new BinEditorFile(m_editor);
m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_BINARY_EDITOR);
m_context << uidm->uniqueIdentifier(Constants::C_BINEDITOR);
m_cursorPositionLabel = new Utils::LineColumnLabel;
......@@ -321,7 +320,9 @@ public:
connect(m_editor, SIGNAL(cursorPositionChanged(int)), this, SLOT(updateCursorPosition(int)));
}
~BinEditorInterface() {}
~BinEditorInterface() {
delete m_editor;
}
QWidget *widget() { return m_editor; }
......
<plugin name="Bookmarks" version="1.3.0" compatVersion="1.3.0">
<plugin name="Bookmarks" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Bookmarks in text editors.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -485,11 +485,10 @@ Bookmark *BookmarkManager::bookmarkForIndex(QModelIndex index)
bool BookmarkManager::gotoBookmark(Bookmark* bookmark)
{
if (!TextEditor::BaseTextEditor::openEditorAt(bookmark->filePath(), bookmark->lineNumber())) {
// Could not open editor
return false;
}
return true;
using namespace TextEditor;
if (ITextEditor *editor = BaseTextEditor::openEditorAt(bookmark->filePath(), bookmark->lineNumber()))
return (editor->currentLine() == bookmark->lineNumber());
return false;
}
void BookmarkManager::nextInDocument()
......
<plugin name="CMakeProjectManager" version="1.3.0" compatVersion="1.3.0">
<plugin name="CMakeProjectManager" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>CMake support</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="CppTools" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="CppTools" version="1.3.1"/>
<dependency name="CppEditor" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Core" version="1.3.0" compatVersion="1.3.0">
<plugin name="Core" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......
......@@ -35,7 +35,7 @@ namespace Constants {
#define IDE_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 3
#define IDE_VERSION_RELEASE 0
#define IDE_VERSION_RELEASE 1
#define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x)
......
......@@ -32,6 +32,8 @@
#include "editormanager.h"
#include "editorview.h"
#include <utils/qtcassert.h>
#include <QtGui/QHeaderView>
Q_DECLARE_METATYPE(Core::Internal::EditorView*)
......@@ -201,11 +203,10 @@ void OpenEditorsWindow::setEditors(EditorView *mainView, EditorView *view, OpenE
foreach (const EditLocation &hi, view->editorHistory()) {
if (hi.file.isNull() || filesDone.contains(hi.file))
continue;
QString title = model->displayNameForFile(hi.file);
QTC_ASSERT(!title.isEmpty(), continue;)
filesDone.insert(hi.file.data());
QTreeWidgetItem *item = new QTreeWidgetItem();
QString title = model->displayNameForFile(hi.file);
if (hi.file->isModified())
title += tr("*");
item->setIcon(0, hi.file->isReadOnly() ? lockedIcon : emptyIcon);
......
<plugin name="CodePaster" version="1.3.0" compatVersion="1.3.0">
<plugin name="CodePaster" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Codepaster plugin for pushing/fetching diff from server</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="CppEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="CppEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>C/C++ editor component.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="CppTools" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="CppTools" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -1374,11 +1374,11 @@ QString CPPEditor::autoComplete(QTextCursor &cursor, const QString &textToInsert
QString brackets = QLatin1String("[]");
if (parentheses.contains(character) || brackets.contains(character)) {
QTextCursor tmp= cursor;
TextEditor::TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp);
int blockStart = tmp.isNull() ? 0 : tmp.position();
bool foundBlockStart = TextEditor::TextBlockUserData::findPreviousBlockOpenParenthesis(&tmp);
int blockStart = foundBlockStart ? tmp.position() : 0;
tmp = cursor;
TextEditor::TextBlockUserData::findNextBlockClosingParenthesis(&tmp);
int blockEnd = tmp.isNull() ? (cursor.document()->characterCount()-1) : tmp.position();
bool foundBlockEnd = TextEditor::TextBlockUserData::findNextBlockClosingParenthesis(&tmp);
int blockEnd = foundBlockEnd ? tmp.position() : (cursor.document()->characterCount() - 1);
QChar openChar = parentheses.contains(character) ? QLatin1Char('(') : QLatin1Char('[');
QChar closeChar = parentheses.contains(character) ? QLatin1Char(')') : QLatin1Char(']');
......
<plugin name="CppTools" version="1.3.0" compatVersion="1.3.0">
<plugin name="CppTools" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Tools for analyzing C/C++ code.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Locator" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Locator" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="CVS" version="1.3.0" compatVersion="1.3.0">
<plugin name="CVS" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>CVS integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="VCSBase" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="VCSBase" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Debugger" version="1.3.0" compatVersion="1.3.0">
<plugin name="Debugger" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Debugger integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.3.0"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="Find" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.1"/><!-- Debugger plugin adds items to the editor's context menu -->
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="Find" version="1.3.1"/>
</dependencyList>
<argumentList>
<argument name="-disable-cdb">Disable Cdb debugger engine</argument>
......
......@@ -750,9 +750,10 @@ static inline bool getUnsignedHexValue(CIDebugSymbolGroup *sg, int index, quint6
return getUnsignedHexValue(stringValue, value);
}
enum { maxStringLength = 4096 };
int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
{
const int maxLength = 40;
QString errorMessage;
unsigned long stringIndex;
if (!lookupPrefix(wd->iname, &stringIndex))
......@@ -774,9 +775,9 @@ int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
if (!getUnsignedHexValue(m_symbolGroup, arrayIndex, &array))
return 5;
// Fetch
const bool truncated = size > maxLength;
const bool truncated = size > maxStringLength;
if (truncated)
size = maxLength;
size = maxStringLength;
const QChar doubleQuote = QLatin1Char('"');
QString value;
if (size > 0) {
......@@ -808,7 +809,6 @@ int CdbSymbolGroupContext::dumpQString(CIDebugDataSpaces *ds, WatchData *wd)
int CdbSymbolGroupContext::dumpStdString(WatchData *wd)
{
const int maxLength = 40;
QString errorMessage;
unsigned long stringIndex;
if (!lookupPrefix(wd->iname, &stringIndex))
......@@ -835,8 +835,8 @@ int CdbSymbolGroupContext::dumpStdString(WatchData *wd)
if (quotePos == -1)
return 1;
bufValue.remove(0, quotePos);
if (bufValue.size() > maxLength) {
bufValue.truncate(maxLength);
if (bufValue.size() > maxStringLength) {
bufValue.truncate(maxStringLength);
bufValue += QLatin1String("...\"");
}
wd->setValue(bufValue);
......
......@@ -105,8 +105,8 @@ void MemoryViewAgent::init(quint64 addr)
} else {
m_manager->showMessageBox(QMessageBox::Warning,
tr("No memory viewer available"),
tr("The memory contents cannot be shown as no viewer plugin not "
"the BinEditor plugin could be loaded."));
tr("The memory contents cannot be shown as no viewer plugin "
"for binary data has been loaded."));
deleteLater();
}
}
......
......@@ -822,7 +822,6 @@ int GdbEngine::commandTimeoutTime() const
void GdbEngine::commandTimeout()
{
qDebug("TIMEOUT");
QList<int> keys = m_cookieForToken.keys();
qSort(keys);
bool killIt = false;
......@@ -836,11 +835,11 @@ void GdbEngine::commandTimeout()
debugMessage(_("TIMED OUT WAITING FOR GDB REPLY. COMMANDS STILL IN PROGRESS:"));
int timeOut = m_commandTimer->interval();
//m_commandTimer->stop();
QString msg = tr("The gdb process has not produced any response "
"to a command within %1 seconds. This may been it is stuck "
const QString msg = tr("The gdb process has not responded "
"to a command within %1 seconds. This could mean it is stuck "
"in an endless loop or taking longer than expected to perform "
"the operation it was reqested.\nYou have a choice of waiting "
"longer or abort debugging.").arg(timeOut);
"the operation.\nYou can choose between waiting "
"longer or abort debugging.").arg(timeOut / 1000);
QMessageBox *mb = showMessageBox(QMessageBox::Critical,
tr("Gdb not responding"), msg,
QMessageBox::Ok | QMessageBox::Cancel);
......@@ -1949,7 +1948,7 @@ void GdbEngine::sendInsertBreakpoint(int index)
void GdbEngine::reloadBreakListInternal()
{
m_breakListUpdating = true;
postCommand(_("-break-list"), CB(handleBreakList));
postCommand(_("-break-list"), NeedsStop, CB(handleBreakList));
}
void GdbEngine::handleBreakList(const GdbResponse &response)
......@@ -3416,6 +3415,17 @@ void GdbEngine::handleDebuggingHelperValue2(const GdbResponse &response)
WatchData data = response.cookie.value<WatchData>();
QTC_ASSERT(data.isValid(), return);
// The real dumper might have aborted without giving any answers.
// Remove traces of the question, too.
if (m_cookieForToken.contains(response.token - 1)) {
m_cookieForToken.remove(response.token - 1);
debugMessage(_("DETECTING LOST COMMAND %1").arg(response.token - 1));
--m_pendingRequests;
data.setError(WatchData::msgNotInScope());
insertData(data);
return;
}
//qDebug() << "CUSTOM VALUE RESULT:" << response.toString();
//qDebug() << "FOR DATA:" << data.toString() << response.resultClass;
if (response.resultClass != GdbResultDone) {
......@@ -4544,7 +4554,7 @@ void GdbEngine::handleInferiorPrepared()
postCommand(_("set substitute-path %1 %2")
.arg(qtBuildPath).arg(qtInstallPath));
#elif defined(Q_OS_UNIX) && !defined (Q_OS_MAC)
qtBuildPath = _("/var/tmp/qt-x11-src-4.6.0");
qtBuildPath = _("/var/tmp/qt-src");
postCommand(_("set substitute-path %1 %2")
.arg(qtBuildPath).arg(qtInstallPath));
#endif
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>397</width>
<height>322</height>
<width>480</width>
<height>371</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -37,7 +37,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="Utils::PathChooser" name="gdbLocationChooser" native="true"/>
<widget class="Utils::PathChooser" name="gdbLocationChooser"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelEnvironment">
......@@ -60,7 +60,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="Utils::PathChooser" name="scriptFileChooser" native="true"/>
<widget class="Utils::PathChooser" name="scriptFileChooser"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBoxUsePreciseBreakpoints">
......@@ -85,11 +85,11 @@ name in different directories.</string>
<item row="4" column="1">
<widget class="QSpinBox" name="spinBoxGdbWatchdogTimeout">
<property name="toolTip">
<string>This is the number of second Qt Creator will wait before
it terminates non-reacting gdb process. The default value of 20 seconds
<string>This is the number of seconds Qt Creator will wait before
it terminates non-responsive gdb process. The default value of 20 seconds
should be sufficient for most applications, but there are situations when
loading big libraries or listing source files takes much longer than that
on slow machines. In this case the value should be increased.</string>
on slow machines. In this case, the value should be increased.</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
......
This diff is collapsed.
......@@ -727,6 +727,18 @@ void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
emitDataChanged(column, index(i, 0, parentIndex));
}
// Truncate value for item view, maintaining quotes
static inline QString truncateValue(QString v)
{
enum { maxLength = 512 };
if (v.size() < maxLength)
return v;
const bool isQuoted = v.endsWith(QLatin1Char('"')); // check for 'char* "Hallo"'
v.truncate(maxLength);
v += isQuoted ? QLatin1String("...\"") : QLatin1String("...");
return v;
}
QVariant WatchModel::data(const QModelIndex &idx, int role) const
{
const WatchItem &data = *watchItem(idx);
......@@ -735,9 +747,9 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case Qt::DisplayRole: {
switch (idx.column()) {
case 0: return data.name;
case 1: return formattedValue(data,
case 1: return truncateValue(formattedValue(data,
m_handler->m_individualFormats.value(data.iname, -1),
m_handler->m_typeFormats.value(data.type, -1));
m_handler->m_typeFormats.value(data.type, -1)));
case 2:
if (!data.displayedType.isEmpty())
return data.displayedType;
......
<plugin name="Designer" version="1.3.0" compatVersion="1.3.0">
<plugin name="Designer" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Qt Designer integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<!-- For compiling with CPP support enabled -->
<dependency name="CppEditor" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="FakeVim" version="1.3.0" compatVersion="1.3.0">
<plugin name="FakeVim" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>VI-style keyboard navigation.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="CppEditor" version="1.3.0"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.1"/><!-- Plugin adds items to the editor's context menu -->
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Find" version="1.3.0" compatVersion="1.3.0">
<plugin name="Find" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides the find widget and the hooks for find implementations.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="GenericProjectManager" version="1.3.0" compatVersion="1.3.0">
<plugin name="GenericProjectManager" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Generic support</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="CppTools" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="CppTools" version="1.3.1"/>
<dependency name="CppEditor" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="ScmGit" version="1.3.0" compatVersion="1.3.0">
<plugin name="ScmGit" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Git integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="VCSBase" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="VCSBase" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="HelloWorld" version="1.3.0" compatVersion="1.3.0">
<plugin name="HelloWorld" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Hello World sample plugin.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Help" version="1.3.0" compatVersion="1.3.0">
<plugin name="Help" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Help system.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Find" version="1.3.0"/>
<dependency name="Locator" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="Find" version="1.3.1"/>
<dependency name="Locator" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Locator" version="1.3.0" compatVersion="1.3.0">
<plugin name="Locator" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides the Locator widget and the hooks for Locator filter implementations.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Perforce" version="1.3.0" compatVersion="1.3.0">
<plugin name="Perforce" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Perforce integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="VCSBase" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="VCSBase" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="ProjectExplorer" version="1.3.0" compatVersion="1.3.0">
<plugin name="ProjectExplorer" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>ProjectExplorer framework that can be extended with different kind of project types.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Find" version="1.3.0"/>
<dependency name="Locator" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="Find" version="1.3.1"/>
<dependency name="Locator" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -2166,7 +2166,7 @@ BuildConfigDialog::BuildConfigDialog(Project *project, QWidget *parent)
QSharedPointer<RunConfiguration> activeRun = m_project->activeRunConfiguration();
foreach (BuildConfiguration *config, m_project->buildConfigurations()) {
if (activeRun->isEnabled(config)) {
m_configCombo->addItem(config->name(), qVariantFromValue(config));
m_configCombo->addItem(config->displayName(), qVariantFromValue(config));
}
}
if (m_configCombo->count() == 0) {
......
<plugin name="QmlEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="QmlEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Editor for QML.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="Help" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="Help" version="1.3.1"/>
</dependencyList>
</plugin>
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
......@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
......@@ -2,7 +2,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -35,7 +35,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
......@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
......@@ -3,7 +3,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -36,7 +36,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
......@@ -3,7 +3,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtScript module of the Qt Toolkit.
**
......@@ -36,7 +36,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
......
<plugin name="QmlProjectManager" version="1.3.0" compatVersion="1.3.0">
<plugin name="QmlProjectManager" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,10 +19,10 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Qml support</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="CppTools" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.0"/>
<dependency name="Help" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="CppTools" version="1.3.1"/>
<dependency name="CppEditor" version="1.3.1"/>
<dependency name="Help" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Qt4ProjectManager" version="1.3.0" compatVersion="1.3.0">
<plugin name="Qt4ProjectManager" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,11 +19,11 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Provides project type for Qt 4 pro files and tools.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="CppTools" version="1.3.0"/>
<dependency name="CppEditor" version="1.3.0"/>
<dependency name="Help" version="1.3.0"/>
<dependency name="Designer" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="CppTools" version="1.3.1"/>
<dependency name="CppEditor" version="1.3.1"/>
<dependency name="Help" version="1.3.1"/>
<dependency name="Designer" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="QtScriptEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="QtScriptEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,7 +19,7 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Editor for QtScript.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="RegExp" version="1.3.0" compatVersion="1.3.0">
<plugin name="RegExp" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Regular Expression test widget.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="ResourceEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="ResourceEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Editor for qrc files.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Snippets" version="1.3.0" compatVersion="1.3.0">
<plugin name="Snippets" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Code snippet plugin.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Subversion" version="1.3.0" compatVersion="1.3.0">
<plugin name="Subversion" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,9 +19,9 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Subversion integration.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.0"/>
<dependency name="VCSBase" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="VCSBase" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="TextEditor" version="1.3.0" compatVersion="1.3.0">
<plugin name="TextEditor" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Text editor framework and the implementation of the basic text editor.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Find" version="1.3.0"/>
<dependency name="Locator" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="Find" version="1.3.1"/>
<dependency name="Locator" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -72,7 +72,12 @@ void BaseTextMark::editorOpened(Core::IEditor *editor)
if (m_markableInterface == 0) { // We aren't added to something
m_markableInterface = textEditor->markableInterface();
m_internalMark = new InternalMark(this);
m_markableInterface->addMark(m_internalMark, m_line);
if (!m_markableInterface->addMark(m_internalMark, m_line)) {
delete m_internalMark;
m_internalMark = 0;
m_markableInterface = 0;
}
}
}
}
......
......@@ -145,8 +145,6 @@ bool ColorScheme::save(const QString &fileName) const
if (!m_name.isEmpty())
w.writeAttribute(QLatin1String("name"), m_name);
Format textFormat = formatFor(QLatin1String(Constants::C_TEXT));
QMapIterator<QString, Format> i(m_formats);
while (i.hasNext()) {
const Format &format = i.next().value();
......
......@@ -33,6 +33,8 @@
#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
#include <QtCore/QCoreApplication>
#include <QtGui/QTextCharFormat>
......@@ -114,8 +116,10 @@ bool FontSettings::fromSettings(const QString &category,
if (s->contains(group + QLatin1String(schemeFileNameKey))) {
// Load the selected color scheme
loadColorScheme(s->value(group + QLatin1String(schemeFileNameKey), defaultSchemeFileName()).toString(),
descriptions);
QString scheme = s->value(group + QLatin1String(schemeFileNameKey)).toString();
if (scheme.isEmpty() || !QFile::exists(scheme))
scheme = defaultSchemeFileName(QFileInfo(scheme).fileName());
loadColorScheme(scheme, descriptions);
} else {
// Load color scheme from ini file
foreach (const FormatDescription &desc, descriptions) {
......@@ -316,11 +320,21 @@ int FontSettings::defaultFontSize()
return DEFAULT_FONT_SIZE;
}
QString FontSettings::defaultSchemeFileName()
/**
* Returns the default scheme file name, or the path to a shipped scheme when
* one exists with the given \a fileName.
*/
QString FontSettings::defaultSchemeFileName(const QString &fileName)
{
QString fileName = Core::ICore::instance()->resourcePath();
fileName += QLatin1String("/styles/default.xml");
return fileName;
QString defaultScheme = Core::ICore::instance()->resourcePath();
defaultScheme += QLatin1String("/styles/");
if (!fileName.isEmpty() && QFile::exists(defaultScheme + fileName))
defaultScheme += fileName;
else
defaultScheme += QLatin1String("default.xml");
return defaultScheme;
}
} // namespace TextEditor
......@@ -100,7 +100,7 @@ public:
static int defaultFontSize();
private:
static QString defaultSchemeFileName();
static QString defaultSchemeFileName(const QString &fileName = QString());
QString m_family;
QString m_schemeFileName;
......
<plugin name="VCSBase" version="1.3.0" compatVersion="1.3.0">
<plugin name="VCSBase" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,8 +19,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Version Control System Base Plugin</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="TextEditor" version="1.3.0"/>
<dependency name="ProjectExplorer" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
<dependency name="TextEditor" version="1.3.1"/>
<dependency name="ProjectExplorer" version="1.3.1"/>
</dependencyList>
</plugin>
<plugin name="Welcome" version="1.3.0" compatVersion="1.3.0">
<plugin name="Welcome" version="1.3.1" compatVersion="1.3.1">
<vendor>Nokia Corporation</vendor>
<copyright>(C) 2008-2009 Nokia Corporation</copyright>
<license>
......@@ -19,6 +19,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Default Welcome Screen Plugin</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.0"/>
<dependency name="Core" version="1.3.1"/>
</dependencyList>
</plugin>
......@@ -456,11 +456,12 @@ static bool registerDebuggerKey(const WCHAR *key,
// Save old key, which might be missing
QString oldDebugger;
registryReadStringKey(handle, debuggerRegistryValueNameC, &oldDebugger, errorMessage);
if (oldDebugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive)) {
if (!oldDebugger.compare(call, Qt::CaseInsensitive)) {
*errorMessage = QLatin1String("The program is already registered as post mortem debugger.");
break;
}
if (!registryWriteStringKey(handle, debuggerRegistryDefaultValueNameC, oldDebugger, errorMessage))
if (!(oldDebugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive)
|| registryWriteStringKey(handle, debuggerRegistryDefaultValueNameC, oldDebugger, errorMessage)))
break;
if (debug)
qDebug() << "registering self as " << call;
......@@ -485,7 +486,9 @@ bool install(QString *errorMessage)
}
// Unregister helper: Restore the original debugger key
static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage)
static bool unregisterDebuggerKey(const WCHAR *key,
const QString &call,
QString *errorMessage)
{
HKEY handle = 0;
bool success = false;
......@@ -494,8 +497,7 @@ static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage)
break;
QString debugger;
registryReadStringKey(handle, debuggerRegistryValueNameC, &debugger, errorMessage);
if (!(debugger.isEmpty()
|| debugger.contains(QLatin1String(applicationFileC), Qt::CaseInsensitive))) {
if (!debugger.isEmpty() && debugger.compare(call, Qt::CaseInsensitive)) {
*errorMessage = QLatin1String("The program is not registered as post mortem debugger.");
break;
}
......@@ -522,10 +524,10 @@ static bool unregisterDebuggerKey(const WCHAR *key, QString *errorMessage)
bool uninstall(QString *errorMessage)
{
if (!unregisterDebuggerKey(debuggerRegistryKeyC, errorMessage))
if (!unregisterDebuggerKey(debuggerRegistryKeyC, debuggerCall(), errorMessage))
return false;
#ifdef Q_OS_WIN64
if (!unregisterDebuggerKey(debuggerWow32RegistryKeyC, errorMessage))
if (!unregisterDebuggerKey(debuggerWow32RegistryKeyC, debuggerCall(QLatin1String("-wow")), errorMessage))
return false;
#endif
return true;
......