Commit 9b3dd396 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Merge branch '1.3'

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
parents 2ce1603c 5268aaed
......@@ -968,7 +968,7 @@
\o \image qtcreator-locator-symbols.png
\row
\o Go to a help topic.
\o Ctrl+K, ?, Space, and the topic
\o Ctrl+K, ?, Space, and the topic name
\o \image qtcreator-locator-help.png
\row
\o Go to an opened document.
......@@ -980,11 +980,11 @@
\o \image qtcreator-locator-filesystem.png
\row
\o Go to a file in any project currently loaded.
\o Ctrl+K, a, Space, and the function name
\o Ctrl+K, a, Space, and the file name
\o \image qtcreator-locator-files.png
\row
\o Go to a file in the current project.
\o Ctrl+K, p, Space, and the function name
\o Ctrl+K, p, Space, and the file name
\o \image qtcreator-locator-current-project.png
\row
\o Go to a class definition.
......@@ -992,7 +992,7 @@
\o \image qtcreator-locator-classes.png
\row
\o Go to a method definition.
\o Ctrl+K, m, Space, and the class name
\o Ctrl+K, m, Space, and the method name
\o \image qtcreator-locator-methods.png
\endtable
......
......@@ -5,7 +5,6 @@
<style name="CurrentLine" foreground="#000000" background="#f2f2f2"/>
<style name="DiffFile"/>
<style name="DiffLocation"/>
<style name="DisabledCode" foreground="#a0a0a4"/>
<style name="Doxygen.Comment" foreground="#808080"/>
<style name="Doxygen.Tag" foreground="#808080" italic="true"/>
<style name="Keyword" bold="true"/>
......@@ -24,6 +23,7 @@
Relying on default colors for:
CurrentLineNumber
DisabledCode
LineNumber
SearchResult
SearchScope
......
......@@ -1164,7 +1164,7 @@
<message>
<location/>
<source>Populate source file view automatically</source>
<translation>Quelldatei-Ansicht wird automatisch aktualisieren</translation>
<translation>Quelldatei-Ansicht automatisch aktualisieren</translation>
</message>
<message>
<location/>
......@@ -5013,7 +5013,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message>
<location line="+1"/>
<source>Select widget to watch</source>
<translation>Widget zwecks Überwachung ausgewählen</translation>
<translation>Widget zur Überwachung auswählen</translation>
</message>
<message>
<location line="+9"/>
......
......@@ -271,7 +271,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &tc) const
// anonymous namespace
return QLatin1String("}");
} else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION)) {
} else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION) || token.is(T_ENUM)) {
if (tk[index - 2].is(T_TYPEDEF)) {
// recognized:
// typedef struct {
......
......@@ -3975,7 +3975,7 @@ void GdbEngine::handleInferiorPrepared()
qtBuildPath = "C:/iwmake/build_mingw_opensource";
postCommand("set substitute-path " + qtBuildPath + ' ' + qtInstallPath);
#elif defined(Q_OS_UNIX) && !defined (Q_OS_MAC)
qtBuildPath = "/var/tmp/qt-x11-src-4.6.1";
qtBuildPath = "/var/tmp/qt-src";
postCommand("set substitute-path " + qtBuildPath + ' ' + qtInstallPath);
#endif
}
......
......@@ -2311,13 +2311,13 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
lineX = fontMetrics().averageCharWidth() * d->m_visibleWrapColumn + offset.x() + 4;
if (lineX < viewportRect.width()) {
const QColor backgroundColor = d->m_ifdefedOutFormat.background().color();
const QBrush background = d->m_ifdefedOutFormat.background();
painter.fillRect(QRectF(lineX, er.top(), viewportRect.width() - lineX, er.height()),
backgroundColor);
background);
const QColor col = (palette().base().color().value() > 128) ? Qt::black : Qt::white;
const QPen pen = painter.pen();
painter.setPen(blendColors(backgroundColor, col, 32));
painter.setPen(blendColors(background.color(), col, 32));
painter.drawLine(QPointF(lineX, er.top()), QPointF(lineX, er.bottom()));
painter.setPen(pen);
}
......
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