Commit b0b5bde2 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/1.3'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp
parents 6c56fbfe f1d79229
QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3 QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3)
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
unix { equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else:win32-g++* { # just mingw
} else { # The lack of spaces in front of the && is necessary!
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
# Always run qhelpgenerator inside its own cmd; this is a workaround for } else { # nmake
# an unusual bug which causes qhelpgenerator.exe to do nothing QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \
HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\n\t) \
$$QDOC_BIN
} }
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
QCH_FILE = $$OUT_PWD/share/doc/qtcreator/qtcreator.qch QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
unix {
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
} else {
html_docs.commands = \"$$QDOC $$PWD/qtcreator.qdocconf\"
}
html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
html_docs.files = $$QHP_FILE html_docs.files = $$QHP_FILE
qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
qch_docs.depends += html_docs qch_docs.depends += html_docs
qch_docs.files = $$QCH_FILE qch_docs.files = $$QCH_FILE
...@@ -32,17 +29,8 @@ unix:!macx { ...@@ -32,17 +29,8 @@ unix:!macx {
INSTALLS += qch_docs INSTALLS += qch_docs
} }
macx { docs.depends = qch_docs
DOC_DIR = "$${OUT_PWD}/bin/Qt Creator.app/Contents/Resources/doc" QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
cp_docs.commands = mkdir -p \"$${DOC_DIR}\" ; $${QMAKE_COPY} \"$${QCH_FILE}\" \"$${DOC_DIR}\"
cp_docs.depends += qch_docs
docs.depends = cp_docs
QMAKE_EXTRA_TARGETS += html_docs qch_docs cp_docs docs
}
!macx {
docs.depends = qch_docs
QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
}
OTHER_FILES = $$PWD/qtcreator.qdoc \ OTHER_FILES = $$PWD/qtcreator.qdoc \
$$PWD/qtcreator.qdocconf $$PWD/qtcreator.qdocconf
......
#! /usr/bin/perl -w
use strict;
my $file = $ARGV[0];
open FILE, $file or die "File $file cannot be opened.";
my @toc = ();
my %title2page = ();
my $doctitle = "";
my $curpage = "";
my $intoc = 0;
while (<FILE>) {
if (!$intoc) {
if (keys(%title2page) == 1 && /^\h*\\list/) {
$intoc = 1;
} elsif (/^\h*\\page\h+(\H+)/) {
$curpage = $1;
} elsif (/^\h*\\title\h+(.+)$/) {
if ($curpage eq "") {
die "Title '$1' appears in no \\page\n";
}
$title2page{$1} = $curpage;
$doctitle = $1 if (!$doctitle);
$curpage = "";
}
} else {
if (/^\h*\\endlist/) {
$intoc = 0;
} elsif (/^\h*\\o\h+\\l{(.*)}$/) {
push @toc, $1;
}
}
}
close FILE;
my %prev = ();
my %next = ();
my $last = $doctitle;
for my $title (@toc) {
$next{$last} = $title2page{$title};
$prev{$title} = $title2page{$last};
$last = $title;
}
open IN, $file or die "File $file cannot be opened a second time?!";
open OUT, '>'.$file.".out" or die "File $file.out cannot be created.";
my $cutting = 0;
while (<IN>) {
if (!$cutting) {
if (/^\h*\\contentspage/) {
$cutting = 1;
}
} else {
if (/^\h*\\title\h+(.+)$/) {
print OUT " \\previouspage ".$prev{$1} if ($prev{$1});
print OUT " \\page ".$title2page{$1};
print OUT " \\nextpage ".$next{$1} if ($next{$1});
print OUT "\n";
$cutting = 0;
} else {
next;
}
}
print OUT $_;
}
close OUT;
close IN;
rename($file.".out", $file) or die "Cannot replace $file with new version.";
This diff is collapsed.
...@@ -12,8 +12,7 @@ defineReplace(cleanPath) { ...@@ -12,8 +12,7 @@ defineReplace(cleanPath) {
} }
defineReplace(targetPath) { defineReplace(targetPath) {
win32:1 ~= s|/|\|g return($$replace(1, /, $$QMAKE_DIR_SEP))
return($$1)
} }
# For use in custom compilers which just copy files # For use in custom compilers which just copy files
...@@ -60,6 +59,7 @@ macx { ...@@ -60,6 +59,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DOC_PATH = $$IDE_DATA_PATH/doc
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1 copydata = 1
} else { } else {
...@@ -74,6 +74,7 @@ macx { ...@@ -74,6 +74,7 @@ macx {
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/qtcreator
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1 !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<message> <message>
<location/> <location/>
<source>+</source> <source>+</source>
<translation></translation> <translation>+</translation>
</message> </message>
<message> <message>
<location/> <location/>
...@@ -901,7 +901,7 @@ ...@@ -901,7 +901,7 @@
<message> <message>
<location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/> <location filename="../../../src/plugins/cvs/settingspage.cpp" line="-34"/>
<source>CVS Command</source> <source>CVS Command</source>
<translation></translation> <translation>CVS-Kommando</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -2199,7 +2199,7 @@ Sollen sie überschrieben werden?</translation> ...@@ -2199,7 +2199,7 @@ Sollen sie überschrieben werden?</translation>
<message> <message>
<location line="+20"/> <location line="+20"/>
<source>Plugin Errors of %1</source> <source>Plugin Errors of %1</source>
<translation></translation> <translation>Fehler in %1</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -3009,7 +3009,7 @@ Sollen sie überschrieben werden?</translation> ...@@ -3009,7 +3009,7 @@ Sollen sie überschrieben werden?</translation>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>Delete all breakpoints</source> <source>Delete all breakpoints</source>
<translation></translation> <translation>Alle Haltepunkte löschen</translation>
</message> </message>
<message> <message>
<location line="+13"/> <location line="+13"/>
...@@ -3762,7 +3762,7 @@ Sollen sie überschrieben werden?</translation> ...@@ -3762,7 +3762,7 @@ Sollen sie überschrieben werden?</translation>
<message> <message>
<location line="+35"/> <location line="+35"/>
<source>Ctrl+Shift+F11</source> <source>Ctrl+Shift+F11</source>
<translation></translation> <translation>Ctrl+Shift+F11</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -4525,7 +4525,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation> ...@@ -4525,7 +4525,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message> <message>
<location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+143"/> <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+143"/>
<source>...</source> <source>...</source>
<translation></translation> <translation>...</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
...@@ -5221,7 +5221,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation> ...@@ -5221,7 +5221,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>F3</source> <source>F3</source>
<translation></translation> <translation>F3</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
...@@ -5231,7 +5231,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation> ...@@ -5231,7 +5231,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>F4</source> <source>F4</source>
<translation></translation> <translation>F4</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
...@@ -5246,42 +5246,42 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation> ...@@ -5246,42 +5246,42 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Meta+H</source> <source>Meta+H</source>
<translation></translation> <translation>Meta+H</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>Ctrl+H</source> <source>Ctrl+H</source>
<translation></translation> <translation>Ctrl+H</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Meta+L</source> <source>Meta+L</source>
<translation></translation> <translation>Meta+L</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>Ctrl+L</source> <source>Ctrl+L</source>
<translation></translation> <translation>Ctrl+L</translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+17"/>
<source>Meta+G</source> <source>Meta+G</source>
<translation></translation> <translation>Meta+G</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>Ctrl+G</source> <source>Ctrl+G</source>
<translation></translation> <translation>Ctrl+G</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+9"/>
<source>Meta+J</source> <source>Meta+J</source>
<translation></translation> <translation>Meta+J</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>Ctrl+J</source> <source>Ctrl+J</source>
<translation></translation> <translation>Ctrl+J</translation>
</message> </message>
<message> <message>
<location line="+20"/> <location line="+20"/>
...@@ -5306,7 +5306,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation> ...@@ -5306,7 +5306,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message> <message>
<location line="+10"/> <location line="+10"/>
<source>Ctrl+Alt+R</source> <source>Ctrl+Alt+R</source>
<translation></translation> <translation>Ctrl+Alt+R</translation>
</message> </message>
<message> <message>
<location line="+15"/> <location line="+15"/>
...@@ -5992,7 +5992,7 @@ Grund: %3</translation> ...@@ -5992,7 +5992,7 @@ Grund: %3</translation>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Ctrl+Shift+F</source> <source>Ctrl+Shift+F</source>
<translation></translation> <translation>Ctrl+Shift+F</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -6010,7 +6010,7 @@ Grund: %3</translation> ...@@ -6010,7 +6010,7 @@ Grund: %3</translation>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Ctrl+E</source> <source>Ctrl+E</source>
<translation></translation> <translation>Ctrl+E</translation>
</message> </message>
<message> <message>
<location line="+6"/> <location line="+6"/>
...@@ -6030,7 +6030,7 @@ Grund: %3</translation> ...@@ -6030,7 +6030,7 @@ Grund: %3</translation>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Ctrl+=</source> <source>Ctrl+=</source>
<translation></translation> <translation>Ctrl+=</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
...@@ -6489,7 +6489,7 @@ Grund: %3</translation> ...@@ -6489,7 +6489,7 @@ Grund: %3</translation>
<message> <message>
<location filename="../../../src/plugins/git/branchdialog.ui"/> <location filename="../../../src/plugins/git/branchdialog.ui"/>
<source>Branches</source> <source>Branches</source>
<translation></translation> <translation>Branches</translation>
</message> </message>
<message> <message>
<location/> <location/>
...@@ -6499,12 +6499,12 @@ Grund: %3</translation> ...@@ -6499,12 +6499,12 @@ Grund: %3</translation>
<message> <message>
<location/> <location/>
<source>Repository:</source> <source>Repository:</source>
<translation></translation> <translation>Repository:</translation>
</message> </message>
<message> <message>
<location/> <location/>
<source>Remote branches</source> <source>Remote branches</source>
<translation>Entferne Branches</translation> <translation>Nichtlokale Branches</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -8840,7 +8840,7 @@ p, li { white-space: pre-wrap; } ...@@ -8840,7 +8840,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location filename="../../../src/plugins/perforce/submitpanel.ui"/> <location filename="../../../src/plugins/perforce/submitpanel.ui"/>
<source>Submit</source> <source>Submit</source>
<translation></translation> <translation>Abschicken</translation>
</message> </message>
<message> <message>
<location/> <location/>
...@@ -10892,7 +10892,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation> ...@@ -10892,7 +10892,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message> <message>
<location/> <location/>
<source>W&amp;hat&apos;s this:</source> <source>W&amp;hat&apos;s this:</source>
<translation></translation> <translation>W&amp;hat&apos;s this:</translation>
</message> </message>
<message> <message>
<location/> <location/>
...@@ -11872,8 +11872,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation> ...@@ -11872,8 +11872,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Select the CSL Arm Toolchain (GCCE) Directory</source> <source>Select the CSL ARM Toolchain (GCCE) Directory</source>
<translation>Ordner der CSL Arm Toolchain (GCCE)</translation> <translation>Ordner der CSL ARM Toolchain (GCCE)</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
...@@ -15829,7 +15829,7 @@ Qt Centre</translation> ...@@ -15829,7 +15829,7 @@ Qt Centre</translation>
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Attached to stopped inferior.</source> <source>Attached to stopped inferior.</source>
<translation></translation> <translation>Debugge angehaltenen Prozess.</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
......
...@@ -9982,8 +9982,8 @@ to version control (%2)?</source> ...@@ -9982,8 +9982,8 @@ to version control (%2)?</source>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Select the CSL Arm Toolchain (GCCE) Directory</source> <source>Select the CSL ARM Toolchain (GCCE) Directory</source>
<translation>CSL Arm ツールチェイン (GCCE) のディレクトリを選択</translation> <translation>CSL ARM ツールチェイン (GCCE) のディレクトリを選択</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
......
...@@ -13436,7 +13436,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr ...@@ -13436,7 +13436,7 @@ Sprawdź czy telefon jest podłączony i czy aplikacja TRK jest uruchomiona.</tr
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Select the CSL Arm Toolchain (GCCE) Directory</source> <source>Select the CSL ARM Toolchain (GCCE) Directory</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
......
...@@ -12310,8 +12310,8 @@ to version control (%2)?</source> ...@@ -12310,8 +12310,8 @@ to version control (%2)?</source>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Select the CSL Arm Toolchain (GCCE) Directory</source> <source>Select the CSL ARM Toolchain (GCCE) Directory</source>
<translation>Выберите каталог с инструментарием CSL Arm (GCCE)</translation> <translation>Выберите каталог с инструментарием CSL ARM (GCCE)</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+11"/>
......
...@@ -524,8 +524,8 @@ void LookupContext::expandFunction(Function *function, ...@@ -524,8 +524,8 @@ void LookupContext::expandFunction(Function *function,
q->isGlobal()); q->isGlobal());
const QList<Symbol *> candidates = resolveClassOrNamespace(nestedNameSpec, visibleScopes); const QList<Symbol *> candidates = resolveClassOrNamespace(nestedNameSpec, visibleScopes);
for (int j = 0; j < candidates.size(); ++j) { for (int j = 0; j < candidates.size(); ++j) {
expand(candidates.at(j)->asScopedSymbol()->members(), if (ScopedSymbol *scopedSymbol = candidates.at(j)->asScopedSymbol())
visibleScopes, expandedScopes); expand(scopedSymbol->members(), visibleScopes, expandedScopes);
} }
} }
} }
......
...@@ -38,9 +38,14 @@ ...@@ -38,9 +38,14 @@
// Format a hex address with a given field width if possible. Convert // Format a hex address with a given field width if possible. Convert
// to number to ensure it is not truncated should it be larger than the // to number to ensure it is not truncated should it be larger than the
// field width. // field width. Check the 64 bit address format '00000001`40002c84'
static inline void formatAddress(QTextStream &str, const QString &hexAddressS, int fieldWidth) static inline void formatAddress(QTextStream &str, QString hexAddressS, int fieldWidth)
{ {
if (hexAddressS.size() > 9) {
const int sepPos = hexAddressS.size() - 9;
if (hexAddressS.at(sepPos) == QLatin1Char('`'))
hexAddressS.remove(sepPos, 1);
}
const QChar oldPadChar = str.padChar(); const QChar oldPadChar = str.padChar();
const int oldFieldWidth = str.fieldWidth(); const int oldFieldWidth = str.fieldWidth();
const int oldIntegerBase = str.integerBase(); const int oldIntegerBase = str.integerBase();
......
...@@ -402,16 +402,20 @@ QString CdbSymbolGroupContext::symbolINameAt(unsigned long index) const ...@@ -402,16 +402,20 @@ QString CdbSymbolGroupContext::symbolINameAt(unsigned long index) const
} }
// Return hexadecimal pointer value from a CDB pointer value // Return hexadecimal pointer value from a CDB pointer value
// which look like "0x000032a" or "0x00000000`0250124a" on 64-bit systems. // which look like "0x000032a" or "0x00000000`0250124a" or
static bool inline getPointerValue(QString stringValue, quint64 *value) // "0x1`0250124a" on 64-bit systems.
static bool inline getUnsignedHexValue(QString stringValue, quint64 *value)
{ {
*value = 0; *value = 0;
if (!stringValue.startsWith(QLatin1String("0x"))) if (!stringValue.startsWith(QLatin1String("0x")))
return false; return false;
stringValue.remove(0, 2); stringValue.remove(0, 2);
// Remove 64bit separator // Remove 64bit separator
if (stringValue.size() > 8 && stringValue.at(8) == QLatin1Char('`')) if (stringValue.size() > 9) {
stringValue.remove(8, 1); const int sepPos = stringValue.size() - 9;