Commit fda652a4 authored by hjk's avatar hjk Committed by hjk
Browse files

debugger: rename gdbmacros* to dumper*

Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872


Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 6244008d
......@@ -8840,7 +8840,7 @@
Qt's bootstrapped applications (such as moc and qmake) are built in a way
that is incompatible with the default build of the debugging helpers. To
work around this, add gdbmacros.cpp to the compiled sources in the
work around this, add \c{dumper.cpp} to the compiled sources in the
application Makefile.
Choose \gui {Tools > Options > Debugger > Debugging Helper > Use debugging
......
......@@ -109,7 +109,7 @@
#else
# include "gdbmacros_p.h"
# include "dumper_p.h"
#endif // QT_BOOTSTRAPPED
......
......@@ -4,7 +4,7 @@ linux-* {
CONFIG -= release
CONFIG += debug
}
SOURCES = gdbmacros.cpp
SOURCES = dumper.cpp
false {
DEFINES += USE_QT_GUI=0
QT = core
......@@ -15,4 +15,4 @@ else {
gui
}
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += HAS_QOBJECT_P_H
HEADERS += gdbmacros_p.h
HEADERS += dumper.h
......@@ -11,7 +11,7 @@ CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
../gdbmacros.cpp
../dumper.cpp
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h) {
DEFINES+=HAS_QOBJECT_P_H
......
......@@ -32,7 +32,7 @@ DATA_DIRS = \
schemes \
styles \
rss \
gdbmacros \
dumper \
qmldesigner \
qmlicons \
qml \
......
......@@ -7109,14 +7109,14 @@ Soubory</translation>
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation type="obsolete">Laděný spustitelný soubor neobsahuje informace potřebné pro hezké zobrazení datových typů Qt.
 
Ujistěte se, že používáte něco na způsob
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
ve svém .pro souboru.</translation>
</message>
......
......@@ -7925,14 +7925,14 @@ Skipping file.</source>
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation>El binario en depuración no contiene la información necesaria para desplegar tipos de datos de Qt.
 
Asegúrese de tener una línea como ésta
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
en su archivo .pro.</translation>
</message>
......
......@@ -9687,14 +9687,14 @@ est ignorée, et un seul &apos;Entrer dans&apos; pour l&apos;émission d&apos;un
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation type="obsolete">Le fichier binaire débogué ne contient pas les informations nécessaires pour l&apos;affichage correct des types de données Qt.
 
Assurez-vous que vous utilisez quelque chose comme
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
dans votre fichier .pro.</translation>
</message>
......@@ -10918,14 +10918,14 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation>A debuggolt bináris fájl nem tartalmazza a szükséges információkat a Qt adattípus megfelelő kijelzéséhez.(new line)
(new line)
Győzödjön meg róla, hogy valami hasonló van a(new line)
(new line)
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp(new line)
SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
(new line)
.pro fájlban.</translation>
</message>
......
......@@ -7894,14 +7894,14 @@ Causa: %3</translation>
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation>L&apos;eseguibile di cui si sta facendo il debug non contiene le informazioni necessarie alla visualizzazione dei tipi di dati Qt.
 
Puoi risolvere inserendo qualcosa tipo
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
nel tuo file .pro.</translation>
</message>
......
......@@ -9176,14 +9176,14 @@ on slow machines. In this case, the value should be increased.</source>
 
Make sure you use something like
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
in your .pro file.</source>
<translation type="obsolete">被调试的程序未包含用于正确显示Qt数据类型的信息。
 
请确保使用添加类似如下信息
 
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
 
到你的.pro文件中。</translation>
</message>
......@@ -310,9 +310,10 @@ QString BuildableHelperLibrary::byInstallDataHelper(const QString &sourcePath,
}
}
// We pretend that the lastmodified of gdbmacros.cpp is 5 minutes before what the file system says
// Because afer a installation from the package the modified dates of gdbmacros.cpp
// and the actual library are close to each other, but not deterministic in one direction
// We pretend that the lastmodified of dumper.cpp is 5 minutes before what
// the file system says because afer a installation from the package the
// modified dates of dumper.cpp and the actual library are close to each
// other, but not deterministic in one direction.
if (sourcesModified.isValid())
sourcesModified = sourcesModified.addSecs(-300);
......
Supports Markdown
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