diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 9d7b473e42fc6ef1082b5bb8bccee518fb1723dc..d4b4870ce6d3a0b60366dfae9129a1c25a5a8e1f 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -45,11 +45,6 @@
#include <QFileInfo>
#include <QAtomicInt>
-// in debug mode: make dumpers widely available without an extra include
-#ifdef QT_DEBUG
-#include "Dumpers.h"
-#endif
-
namespace CPlusPlus {
class Macro;
diff --git a/src/libs/cplusplus/Dumpers.cpp b/src/libs/cplusplus/Dumpers.cpp
deleted file mode 100644
index cd2ccce71f35dc5b980f0b5530f22668d6868b1f..0000000000000000000000000000000000000000
--- a/src/libs/cplusplus/Dumpers.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms and
-** conditions see http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "Dumpers.h"
-
-#include "Overview.h"
-#include "LookupContext.h"
-
-#include <cplusplus/Literals.h>
-#include <cplusplus/Scope.h>
-
-#include <QDebug>
-
-#include <typeinfo>
-
-static QString indent(QString s, int level = 2)
-{
- QString indentString(level, QLatin1Char(' '));
- QString result;
- int last = 0;
- for (int i = 0; i < s.length(); ++i) {
- if (s.at(i) == QLatin1Char('\n') || i == s.length() - 1) {
- result.append(indentString);
- result.append(s.midRef(last, i + 1));
- last = i + 1;
- }
- }
- return result;
-}
-
-QString CPlusPlus::toString(const Name *name, QString id)
-{
- Overview oo;
- return QString::fromLatin1("%0: %1").arg(id, name ? oo.prettyName(name) : QLatin1String("(null)"));
-}
-
-QString CPlusPlus::toString(FullySpecifiedType ty, QString id)
-{
- Overview oo;
- return QString::fromLatin1("%0: %1 (a %2)").arg(id, oo.prettyType(ty),
- QLatin1String(ty.type() ? typeid(*ty.type()).name() : "(null)"));
-}
-
-QString CPlusPlus::toString(const Symbol *s, QString id)
-{
- if (!s)
- return QString::fromLatin1("%0: (null)").arg(id);
-
- return QString::fromLatin1("%0: %1 (%2) at %3:%4:%5\n%6").arg(
- id,
- QString::fromLatin1(typeid(*s).name()),
- s->identifier() ? QString::fromUtf8(s->identifier()->chars()) : QLatin1String("no id"),
- QString::fromLatin1(s->fileName()),
- QString::number(s->line()),
- QString::number(s->column()),
- indent(toString(s->type())));
-}
-
-QString CPlusPlus::toString(const LookupItem &it, const QString &id)
-{
- QString result = QString::fromLatin1("%1:").arg(id);
- if (it.declaration())
- result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.declaration(), QLatin1String("Decl")))));
- if (it.type().isValid())
- result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.type()))));
- if (it.scope())
- result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.scope(), QLatin1String("Scope")))));
- if (it.binding())
- result.append(QString::fromLatin1("\n%1").arg(indent(toString(it.binding(), QLatin1String("Binding")))));
- return result;
-}
-
-QString CPlusPlus::toString(const LookupScope *binding, QString id)
-{
- if (!binding)
- return QString::fromLatin1("%0: (null)").arg(id);
-
- QString result = QString::fromLatin1("%0: %1 symbols").arg(
- id,
- QString::number(binding->symbols().length()));
- return result;
-}
-
-void CPlusPlus::dump(const Name *name)
-{
- qDebug() << qPrintable(toString(name));
-}
-
-void CPlusPlus::dump(const FullySpecifiedType &ty)
-{
- qDebug() << qPrintable(toString(ty));
-}
-
-void CPlusPlus::dump(const Symbol *s)
-{
- qDebug() << qPrintable(toString(s));
-}
-
-void CPlusPlus::dump(const LookupItem &it)
-{
- qDebug() << qPrintable(toString(it));
-}
-
-void CPlusPlus::dump(const LookupScope *binding)
-{
- qDebug() << qPrintable(toString(binding));
-}
diff --git a/src/libs/cplusplus/Dumpers.h b/src/libs/cplusplus/Dumpers.h
deleted file mode 100644
index c6f358cf578fc2de7a861746596d0a56c1eff32b..0000000000000000000000000000000000000000
--- a/src/libs/cplusplus/Dumpers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms and
-** conditions see http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef CPLUSPLUS_DUMPERS_H
-#define CPLUSPLUS_DUMPERS_H
-
-#include "LookupItem.h"
-
-#include <cplusplus/CPlusPlusForwardDeclarations.h>
-#include <cplusplus/FullySpecifiedType.h>
-#include <cplusplus/Symbol.h>
-
-#include <QString>
-
-namespace CPlusPlus {
-
-QString CPLUSPLUS_EXPORT toString(const Name *name, QString id = QLatin1String("Name"));
-QString CPLUSPLUS_EXPORT toString(FullySpecifiedType ty, QString id = QLatin1String("Type"));
-QString CPLUSPLUS_EXPORT toString(const Symbol *s, QString id = QLatin1String("Symbol"));
-QString CPLUSPLUS_EXPORT toString(const LookupItem &it, const QString &id = QLatin1String("LookupItem"));
-QString CPLUSPLUS_EXPORT toString(const LookupScope *binding, QString id = QLatin1String("LookupScope"));
-
-void CPLUSPLUS_EXPORT dump(const Name *name);
-void CPLUSPLUS_EXPORT dump(const FullySpecifiedType &ty);
-void CPLUSPLUS_EXPORT dump(const Symbol *s);
-void CPLUSPLUS_EXPORT dump(const LookupItem &it);
-void CPLUSPLUS_EXPORT dump(const LookupScope *binding);
-
-} // namespace CPlusPlus
-
-#endif
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 7a9e7318bd5efdbe3d4f39d26e26ffed1dd9c3be..ebb5ad07f1e018aaf0c7787900f32b01b93c1720 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -57,7 +57,6 @@ HEADERS += \
$$PWD/pp-scanner.h \
$$PWD/findcdbbreakpoint.h \
$$PWD/PPToken.h \
- $$PWD/Dumpers.h \
$$PWD/cppmodelmanagerbase.h
SOURCES += \
@@ -86,7 +85,6 @@ SOURCES += \
$$PWD/pp-scanner.cpp \
$$PWD/findcdbbreakpoint.cpp \
$$PWD/PPToken.cpp \
- $$PWD/Dumpers.cpp \
$$PWD/cppmodelmanagerbase.cpp
RESOURCES += $$PWD/cplusplus.qrc