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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

31 files changed, 48 insertions, 46 deletions

diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 9ed32b073a..340ad5010d 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -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
diff --git a/share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT b/share/qtcreator/dumper/LGPL_EXCEPTION.TXT
index 8d0f85eba4..8d0f85eba4 100644
--- a/share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT
+++ b/share/qtcreator/dumper/LGPL_EXCEPTION.TXT
diff --git a/share/qtcreator/gdbmacros/LICENSE.LGPL b/share/qtcreator/dumper/LICENSE.LGPL
index 602bfc9463..602bfc9463 100644
--- a/share/qtcreator/gdbmacros/LICENSE.LGPL
+++ b/share/qtcreator/dumper/LICENSE.LGPL
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/dumper/dumper.cpp
index aff1119dff..8f64da17c6 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/dumper/dumper.cpp
@@ -109,7 +109,7 @@
 
 #else
 
-#   include "gdbmacros_p.h"
+#   include "dumper_p.h"
 
 #endif // QT_BOOTSTRAPPED
 
diff --git a/share/qtcreator/gdbmacros/gdbmacros.h b/share/qtcreator/dumper/dumper.h
index 644c9b9201..644c9b9201 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.h
+++ b/share/qtcreator/dumper/dumper.h
diff --git a/share/qtcreator/gdbmacros/gdbmacros.pro b/share/qtcreator/dumper/dumper.pro
index 812b1fe262..323ff220e5 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/dumper/dumper.pro
@@ -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
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/dumper/dumper.py
index 887f25c1a2..887f25c1a2 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/dumper/dumper.py
diff --git a/share/qtcreator/gdbmacros/gdbmacros_p.h b/share/qtcreator/dumper/dumper_p.h
index 35b24edbff..35b24edbff 100644
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/dumper/dumper_p.h
diff --git a/share/qtcreator/gdbmacros/pdumper.py b/share/qtcreator/dumper/pdumper.py
index e0144490ab..e0144490ab 100644
--- a/share/qtcreator/gdbmacros/pdumper.py
+++ b/share/qtcreator/dumper/pdumper.py
diff --git a/share/qtcreator/gdbmacros/qttypes.py b/share/qtcreator/dumper/qttypes.py
index 066398a4c3..066398a4c3 100644
--- a/share/qtcreator/gdbmacros/qttypes.py
+++ b/share/qtcreator/dumper/qttypes.py
diff --git a/share/qtcreator/gdbmacros/test/dumpertest.pro b/share/qtcreator/dumper/test/dumpertest.pro
index ddac946a12..be4c9a5894 100644
--- a/share/qtcreator/gdbmacros/test/dumpertest.pro
+++ b/share/qtcreator/dumper/test/dumpertest.pro
@@ -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
diff --git a/share/qtcreator/gdbmacros/test/main.cpp b/share/qtcreator/dumper/test/main.cpp
index 00eb317c2c..00eb317c2c 100644
--- a/share/qtcreator/gdbmacros/test/main.cpp
+++ b/share/qtcreator/dumper/test/main.cpp
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 815d869e91..807976c84c 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -32,7 +32,7 @@ DATA_DIRS = \
     schemes \
     styles \
     rss \
-    gdbmacros \
+    dumper \
     qmldesigner \
     qmlicons \
     qml \
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index cd4fd0c76b..0b666c0677 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -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>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 8dddfe5d79..7219265843 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -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>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 47c4800e5a..94fb43fa2b 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -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>
diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts
index afa94b5de7..28a78b3331 100644
--- a/share/qtcreator/translations/qtcreator_hu.ts
+++ b/share/qtcreator/translations/qtcreator_hu.ts
@@ -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>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index bf0eb0b77e..2256d29336 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -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>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 0e26586e4e..8dbfd577fe 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -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>
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index 586c69745f..8dc364815b 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -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);
 
diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro
index fda9873f85..ee0cad0fd6 100644
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -22,5 +22,5 @@ true {
     QT = core gui
 }
 
-SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
+SOURCES += ../../../share/qtcreator/dumper/dumper.cpp
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 8ab6a2fbad..e95f4a4277 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1171,8 +1171,8 @@ void GdbEngine::handleQuerySources(const GdbResponse &response)
         QMap<QString, QString> oldShortToFull = m_shortToFullName;
         m_shortToFullName.clear();
         m_fullToShortName.clear();
-        // "^done,files=[{file="../../../../bin/gdbmacros/gdbmacros.cpp",
-        // fullname="/data5/dev/ide/main/bin/gdbmacros/gdbmacros.cpp"},
+        // "^done,files=[{file="../../../../bin/dumper/dumper.cpp",
+        // fullname="/data5/dev/ide/main/bin/dumper/dumper.cpp"},
         GdbMi files = response.data.findChild("files");
         foreach (const GdbMi &item, files.children()) {
             GdbMi fullName = item.findChild("fullname");
@@ -4724,7 +4724,7 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint)
 void GdbEngine::loadPythonDumpers()
 {
     const QByteArray dumperSourcePath =
-        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
+        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
 
     postCommand("python execfile('" + dumperSourcePath + "bridge.py')",
         ConsoleCommand|NonCriticalResponse);
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index fa7756919d..c3cbf0d024 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -214,7 +214,7 @@ void PdbEngine::runEngine()
     QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
     showStatusMessage(tr("Running requested..."), 5000);
     const QByteArray dumperSourcePath =
-        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
+        Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
     QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
     postDirectCommand("import sys");
     postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index e420708503..f7cd47b072 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -51,9 +51,9 @@ using namespace ProjectExplorer;
 static inline QStringList validBinaryFilenames()
 {
     return QStringList()
-            << QLatin1String("debug/gdbmacros.dll")
-            << QLatin1String("libgdbmacros.dylib")
-            << QLatin1String("libgdbmacros.so");
+            << QLatin1String("debug/dumper.dll")
+            << QLatin1String("libdumper.dylib")
+            << QLatin1String("libdumper.so");
 }
 
 QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QString &qtInstallData)
@@ -82,14 +82,14 @@ QStringList DebuggingHelperLibrary::locationsByInstallData(const QString &qtInst
 
 static QString sourcePath()
 {
-    return Core::ICore::instance()->resourcePath() + QLatin1String("/gdbmacros/");
+    return Core::ICore::instance()->resourcePath() + QLatin1String("/dumper/");
 }
 
 static QStringList sourceFileNames()
 {
     return QStringList()
-            << QLatin1String("gdbmacros.cpp") << QLatin1String("gdbmacros_p.h")
-            << QLatin1String("gdbmacros.h") << QLatin1String("gdbmacros.pro")
+            << QLatin1String("dumper.cpp") << QLatin1String("dumper_p.h")
+            << QLatin1String("dumper.h") << QLatin1String("dumper.pro")
             << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT");
 }
 
@@ -127,7 +127,7 @@ QString DebuggingHelperLibrary::copy(const QString &qtInstallData,
 
 bool DebuggingHelperLibrary::build(BuildHelperArguments arguments, QString *log, QString *errorMessage)
 {
-    arguments.proFilename = QLatin1String("gdbmacros.pro");
+    arguments.proFilename = QLatin1String("dumper.pro");
     arguments.helperName = QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
                                                        "GDB helper");
     return buildHelper(arguments, log, errorMessage);
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 395d5cdbbf..845bb58c6f 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -367,13 +367,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QList<ProjectExplorer::Task>()
             << QString();
     QTest::newRow("note")
-            << QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here")
+            << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
             << QString() << QString()
             << ( QList<ProjectExplorer::Task>()
                  << Task(Task::Unknown,
                          QLatin1String("initialized from here"),
-                         QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp"), 1079,
+                         QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp"), 1079,
                          Constants::TASK_CATEGORY_COMPILE))
             << QString();
     QTest::newRow("static member function")
diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp
index bd8573f713..6d01af617f 100644
--- a/src/plugins/projectexplorer/gnumakeparser.cpp
+++ b/src/plugins/projectexplorer/gnumakeparser.cpp
@@ -318,9 +318,9 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
             << QStringList();
     QTest::newRow("pass-trough note")
             << QStringList()
-            << QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here")
+            << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
-            << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here\n")
+            << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here\n")
             << QList<ProjectExplorer::Task>()
             << QString()
             << QStringList();
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 35d7a4d43f..705a96360d 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -3,11 +3,11 @@ include($$IDE_SOURCE_TREE/src/libs/symbianutils/symbianutils.pri)
 
 DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
 UTILSDIR    = $$IDE_SOURCE_TREE/src/libs
-MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
+MACROSDIR   = $$IDE_SOURCE_TREE/share/qtcreator/dumper
 
 SOURCES += \
     $$DEBUGGERDIR/gdb/gdbmi.cpp \
-    $$MACROSDIR/gdbmacros.cpp \
+    $$MACROSDIR/dumper.cpp \
     tst_dumpers.cpp \
 
 DEFINES += MACROSDEBUG
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 36fa8a48ab..0364e70b33 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -35,8 +35,8 @@
 #undef private
 
 #include "gdb/gdbmi.h"
-#include "gdbmacros.h"
-#include "gdbmacros_p.h"
+#include "dumper.h"
+#include "dumper_p.h"
 
 #include "json.h"
 
@@ -2277,7 +2277,7 @@ void tst_Dumpers::dumpQSharedPointer()
     // Case 2: Composite type.
     // Case 1.1: Null pointer.
     QSharedPointer<QString> compositePtr;
-    // TODO: This case is not handled in gdbmacros.cpp (segfault!)
+    // TODO: This case is not handled in dumper.cpp (segfault!)
     //dumpQSharedPointerHelper(compoistePtr);
 
     // Case 1.2: Non-null pointer,
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 9c0aa92e9e..1d2cca0016 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -398,8 +398,9 @@ GdbWrapper::GdbWrapper(tst_Gdb *test) : m_test(test)
     connect(&m_proc, SIGNAL(readyReadStandardError()),
         this, SLOT(readStandardError()));
 
-    m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/dumper.py')\n");
-    m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/gdbmacros.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/bridge.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/dumper.py')\n");
+    m_proc.write("python execfile('../../../share/qtcreator/dumper/qttypes.py')\n");
     m_proc.write("bbsetup\n");
     m_proc.write("break breaker\n");
     m_proc.write("handle SIGSTOP stop pass\n");
diff --git a/tests/manual/gdbdebugger/helper/helper.pro b/tests/manual/gdbdebugger/helper/helper.pro
index 3812ecfa5e..5ccf8f946d 100644
--- a/tests/manual/gdbdebugger/helper/helper.pro
+++ b/tests/manual/gdbdebugger/helper/helper.pro
@@ -2,5 +2,5 @@ include(../../../../qtcreator.pri)
 TEMPLATE = app
 
 win32:DEFINES += _CRT_SECURE_NO_WARNINGS
-SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros/gdbmacros.cpp
+SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/dumper/dumper.cpp
 SOURCES += main.cpp
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index e5de9fd16e..7283d7e8f5 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -720,7 +720,7 @@ struct Function
 
 void testFunction()
 {
-    // In order to use this, switch on the 'qDump__Function' in gdbmacros.py
+    // In order to use this, switch on the 'qDump__Function' in dumper.py
     Function func("x", "sin(x)", 0, 1);
     func.max = 10;
     func.f = "cos(x)";