Removed module names from #include directives.

Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

src/plugins/valgrind/callgrind/callgrindabstractmodel.h

@@ -33,7 +33,7 @@
 #ifndef LIBVALGRIND_CALLGRINDABSTRACTMODEL_H
 #define LIBVALGRIND_CALLGRINDABSTRACTMODEL_H
 
-#include <QtGui/QAbstractItemView>
+#include <QAbstractItemView>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindcallmodel.h

@@ -33,7 +33,7 @@
 #ifndef VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H
 #define VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H
 
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
 
 #include "callgrindabstractmodel.h"
 

src/plugins/valgrind/callgrind/callgrindcostitem.cpp

@@ -32,9 +32,9 @@
 
 #include "callgrindcostitem.h"
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QString>
+#include <QStringList>
+#include <QVector>
 
 #include "callgrindparsedata.h"
 #include "callgrindfunctioncall.h"

src/plugins/valgrind/callgrind/callgrindcostitem.h

@@ -33,7 +33,7 @@
 #ifndef LIBVALGRIND_CALLGRIND_COSTITEM_H
 #define LIBVALGRIND_CALLGRIND_COSTITEM_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/plugins/valgrind/callgrind/callgrindcycledetection.cpp

@@ -39,7 +39,7 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindcycledetection.h

@@ -33,8 +33,8 @@
 #ifndef LIBVALGRIND_CALLGRINDCYCLEDETECTION_H
 #define LIBVALGRIND_CALLGRINDCYCLEDETECTION_H
 
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QHash>
+#include <QStack>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrinddatamodel.cpp

@@ -38,10 +38,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QChar>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QChar>
+#include <QDebug>
+#include <QStringList>
+#include <QVector>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrinddatamodel.h

@@ -35,7 +35,7 @@
 
 #include "callgrindabstractmodel.h"
 
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindfunction.cpp

@@ -39,11 +39,11 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
+#include <QString>
+#include <QStringList>
+#include <QDebug>
+#include <QFileInfo>
+#include <QCoreApplication>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindfunction.h

@@ -33,8 +33,8 @@
 #ifndef LIBVALGRIND_CALLGRIND_FUNCTION_H
 #define LIBVALGRIND_CALLGRIND_FUNCTION_H
 
-#include <QtCore/QMetaType>
-#include <QtCore/QVector>
+#include <QMetaType>
+#include <QVector>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindfunction_p.h

@@ -38,8 +38,8 @@
 #include "callgrindcostitem.h"
 #include "callgrindfunctioncall.h"
 
-#include <QtCore/QVector>
-#include <QtCore/QHash>
+#include <QVector>
+#include <QHash>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp

@@ -36,7 +36,7 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QVector>
+#include <QVector>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindfunctioncall.h

@@ -33,7 +33,7 @@
 #ifndef LIBVALGRIND_CALLGRIND_CALLEE_H
 #define LIBVALGRIND_CALLGRIND_CALLEE_H
 
-#include <QtCore/QMetaType>
+#include <QMetaType>
 
 QT_BEGIN_NAMESPACE
 template <typename T> class QVector;

src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp

@@ -36,8 +36,8 @@
 #include "callgrindfunctioncall.h"
 #include "callgrindparsedata.h"
 
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QStringList>
+#include <QDebug>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindparsedata.cpp

@@ -38,10 +38,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QHash>
-#include <QtCore/QCoreApplication>
+#include <QStringList>
+#include <QVector>
+#include <QHash>
+#include <QCoreApplication>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrind/callgrindparsedata.h

@@ -33,7 +33,7 @@
 #ifndef LIBVALGRIND_CALLGRIND_PARSEDATA_P_H
 #define LIBVALGRIND_CALLGRIND_PARSEDATA_P_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/plugins/valgrind/callgrind/callgrindparser.cpp

@@ -39,10 +39,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QHash>
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
+#include <QHash>
+#include <QVector>
+#include <QStringList>
+#include <QDebug>
 
 // #define DEBUG_PARSER
 

src/plugins/valgrind/callgrind/callgrindrunner.cpp

@@ -35,7 +35,7 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFile>
+#include <QFile>
 
 namespace Valgrind {
 namespace Callgrind {

src/plugins/valgrind/callgrindcostdelegate.cpp

@@ -40,8 +40,8 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
+#include <QApplication>
+#include <QPainter>
 
 using namespace Valgrind::Callgrind;
 

src/plugins/valgrind/callgrindcostdelegate.h

@@ -33,7 +33,7 @@
 #ifndef CALLGRINDCOSTDELEGATE_H
 #define CALLGRINDCOSTDELEGATE_H
 
-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/callgrindcostview.cpp

@@ -39,9 +39,9 @@
 #include <valgrind/callgrind/callgrindfunction.h>
 #include <valgrind/callgrind/callgrindcallmodel.h>
 
-#include <QtGui/QAbstractProxyModel>
-#include <QtGui/QHeaderView>
-#include <QtCore/QDebug>
+#include <QAbstractProxyModel>
+#include <QHeaderView>
+#include <QDebug>
 
 using namespace Valgrind::Callgrind;
 

src/plugins/valgrind/callgrindcostview.h

@@ -35,7 +35,7 @@
 
 #include "callgrindcostdelegate.h"
 
-#include <QtGui/QTreeView>
+#include <QTreeView>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/callgrindhelper.cpp

@@ -34,9 +34,9 @@
 
 #include <cstdlib>
 
-#include <QtGui/QColor>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#include <QColor>
+#include <QMap>
+#include <QString>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/callgrindhelper.h

@@ -33,7 +33,7 @@
 #ifndef CALLGRINDHELPER_H
 #define CALLGRINDHELPER_H
 
-#include <QtCore/QLocale>
+#include <QLocale>
 
 QT_BEGIN_NAMESPACE
 class QColor;

src/plugins/valgrind/callgrindnamedelegate.cpp

@@ -34,8 +34,8 @@
 
 #include "callgrindhelper.h"
 
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
+#include <QApplication>
+#include <QPainter>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/callgrindnamedelegate.h

@@ -33,7 +33,7 @@
 #ifndef CALLGRINDNAMEDELEGATE_H
 #define CALLGRINDNAMEDELEGATE_H
 
-#include <QtGui/QStyledItemDelegate>
+#include <QStyledItemDelegate>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/callgrindtextmark.cpp

@@ -37,8 +37,8 @@
 #include "callgrind/callgrinddatamodel.h"
 #include "callgrind/callgrindfunction.h"
 
-#include <QtCore/QDebug>
-#include <QtGui/QPainter>
+#include <QDebug>
+#include <QPainter>
 
 #include <utils/qtcassert.h>
 

src/plugins/valgrind/callgrindtextmark.h

@@ -35,7 +35,7 @@
 
 #include <texteditor/basetextmark.h>
 
-#include <QtCore/QPersistentModelIndex>
+#include <QPersistentModelIndex>
 
 namespace Valgrind {
 

src/plugins/valgrind/callgrindtool.cpp

@@ -74,23 +74,23 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTimer>
+#include <QFile>
+#include <QFileInfo>
+#include <QTimer>
 
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QDockWidget>
-#include <QtGui/QGraphicsItem>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMenu>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QVBoxLayout>
+#include <QAction>
+#include <QActionGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDockWidget>
+#include <QGraphicsItem>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QMenu>
+#include <QSortFilterProxyModel>
+#include <QToolBar>
+#include <QToolButton>
+#include <QVBoxLayout>
 
 // shared/cplusplus includes
 #include <Symbols.h>

src/plugins/valgrind/callgrindvisualisation.cpp

@@ -40,17 +40,17 @@
 #include <valgrind/callgrind/callgrindproxymodel.h>
 #include <utils/qtcassert.h>
 
-#include <QtGui/QGraphicsRectItem>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsSimpleTextItem>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QStaticText>
-#include <QtGui/QStyleOptionGraphicsItem>
-#include <QtCore/QPair>
-#include <QtCore/QPersistentModelIndex>
-#include <QtCore/QLinkedList>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QDebug>
+#include <QGraphicsRectItem>
+#include <QGraphicsScene>
+#include <QGraphicsSimpleTextItem>
+#include <QMouseEvent>
+#include <QStaticText>
+#include <QStyleOptionGraphicsItem>
+#include <QPair>
+#include <QPersistentModelIndex>
+#include <QLinkedList>
+#include <QAbstractItemModel>
+#include <QDebug>
 
 #define VISUALISATION_DEBUG 0
 // Margin from hardcoded value in:

src/plugins/valgrind/callgrindvisualisation.h

@@ -33,7 +33,7 @@
 #ifndef CALLGRINDVISUALISATION_H
 #define CALLGRINDVISUALISATION_H
 
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
 
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;

src/plugins/valgrind/memcheck/memcheckrunner.cpp

@@ -40,16 +40,16 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtNetwork/QNetworkInterface>
-#include <QtNetwork/QTcpServer>
-#include <QtNetwork/QTcpSocket>
-#include <QtCore/QEventLoop>
-#include <QtGui/QApplication>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLabel>
-#include <QtGui/QListWidget>
-#include <QtGui/QVBoxLayout>
+#include <QNetworkInterface>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QEventLoop>
+#include <QApplication>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QVBoxLayout>
 
 namespace Valgrind {
 namespace Memcheck {

src/plugins/valgrind/memcheckerrorview.cpp

@@ -50,20 +50,20 @@
 #include <texteditor/basetexteditor.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
+#include <QDir>
+#include <QDebug>
 
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtGui/QLabel>
-#include <QtGui/QListView>
-#include <QtGui/QMenu>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollBar>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStyledItemDelegate>
-#include <QtGui/QVBoxLayout>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QLabel>
+#include <QListView>
+#include <QMenu>
+#include <QPainter>
+#include <QScrollBar>
+#include <QSortFilterProxyModel>
+#include <QStyledItemDelegate>
+#include <QVBoxLayout>
 
 using namespace Valgrind::XmlProtocol;
 

src/plugins/valgrind/memcheckerrorview.h

@@ -35,7 +35,7 @@
 #ifndef MEMCHECKERRORVIEW_H
 #define MEMCHECKERRORVIEW_H
 
-#include <QtGui/QListView>
+#include <QListView>
 
 namespace Analyzer { class AnalyzerSettings; }
 

src/plugins/valgrind/memchecktool.cpp

@@ -71,22 +71,22 @@
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QString>
-#include <QtCore/QLatin1String>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QString>
+#include <QLatin1String>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
 
-#include <QtGui/QDockWidget>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QToolButton>
-#include <QtGui/QCheckBox>
+#include <QDockWidget>
+#include <QHBoxLayout>
+#include <QComboBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QAction>
+#include <QMenu>
+#include <QMessageBox>
+#include <QToolButton>
+#include <QCheckBox>
 #include <utils/stylehelper.h>
 
 using namespace Analyzer;

src/plugins/valgrind/memchecktool.h

@@ -37,8 +37,8 @@
 
 #include "valgrindtool.h"
 
-#include <QtGui/QSortFilterProxyModel>
-#include <QtCore/QSharedPointer>
+#include <QSortFilterProxyModel>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QItemSelection;

src/plugins/valgrind/suppressiondialog.cpp

@@ -51,13 +51,13 @@
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFile>
+#include <QFile>
 
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QFormLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
-#include <QtGui/QPlainTextEdit>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QPushButton>
+#include <QLabel>
+#include <QPlainTextEdit>
 
 using namespace Analyzer;
 using namespace Valgrind::XmlProtocol;

src/plugins/valgrind/suppressiondialog.h

@@ -39,7 +39,7 @@
 
 #include <utils/pathchooser.h>
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;

src/plugins/valgrind/valgrindconfigwidget.cpp

@@ -39,10 +39,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QFileDialog>
+#include <QStandardItemModel>
+#include <QFileDialog>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/valgrindconfigwidget.h

@@ -35,7 +35,7 @@
 #ifndef ANALYZER_VALGRINDCONFIGWIDGET_H
 #define ANALYZER_VALGRINDCONFIGWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QStandardItemModel;

src/plugins/valgrind/valgrindengine.cpp

@@ -43,8 +43,8 @@
 #include <projectexplorer/applicationrunconfiguration.h>
 #include <analyzerbase/analyzermanager.h>
 
-#include <QtGui/QApplication>
-#include <QtGui/QMainWindow>
+#include <QApplication>
+#include <QMainWindow>
 
 #define VALGRIND_DEBUG_OUTPUT 0
 

src/plugins/valgrind/valgrindengine.h

@@ -41,10 +41,10 @@
 
 #include <valgrind/valgrindrunner.h>
 
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
-#include <QtCore/QFutureInterface>
-#include <QtCore/QFutureWatcher>
+#include <QString>
+#include <QByteArray>
+#include <QFutureInterface>
+#include <QFutureWatcher>
 
 namespace Analyzer {
 class AnalyzerSettings;

src/plugins/valgrind/valgrindplugin.cpp

@@ -52,10 +52,10 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-#include <QtCore/QtPlugin>
-#include <QtGui/QAction>
+#include <QDebug>
+#include <QStringList>
+#include <QtPlugin>
+#include <QAction>
 
 using namespace Analyzer;
 using namespace ProjectExplorer;

src/plugins/valgrind/valgrindprocess.cpp

@@ -34,14 +34,14 @@
 
 #include "valgrindprocess.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QEventLoop>
-#include <QtCore/QFileInfo>
+#include <QDebug>
+#include <QEventLoop>
+#include <QFileInfo>
 
 #include <utils/qtcassert.h>
 
 #ifdef Q_OS_WIN
-#    include <QtCore/qt_windows.h>
+#    include <qt_windows.h>
 #endif
 
 namespace Valgrind {

src/plugins/valgrind/valgrindrunner.cpp

@@ -41,7 +41,7 @@
 #include <utils/ssh/sshconnection.h>
 #include <utils/ssh/sshremoteprocess.h>
 
-#include <QtCore/QEventLoop>
+#include <QEventLoop>
 
 namespace Valgrind {
 

src/plugins/valgrind/valgrindrunner.h

@@ -40,7 +40,7 @@
 #include <utils/outputformat.h>
 #include <utils/ssh/sshconnection.h>
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 namespace Utils {
 class Environment;

src/plugins/valgrind/valgrindsettings.cpp

@@ -39,8 +39,8 @@
 #include <utils/qtcassert.h>
 #include <valgrind/xmlprotocol/error.h>
 
-#include <QtCore/QSettings>
-#include <QtCore/QDebug>
+#include <QSettings>
+#include <QDebug>
 
 
 using namespace Analyzer;

src/plugins/valgrind/valgrindsettings.h

@@ -38,9 +38,9 @@
 #include <analyzerbase/analyzersettings.h>
 #include "callgrindcostdelegate.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QString>
+#include <QVariant>
 
 namespace Valgrind {
 namespace Internal {

src/plugins/valgrind/workarounds.cpp

@@ -32,7 +32,7 @@
 
 #include "workarounds.h"
 
-#include <QtGui/QPalette>
+#include <QPalette>
 
 #include <utils/stylehelper.h>
 

src/plugins/valgrind/workarounds.h

@@ -33,7 +33,7 @@
 #ifndef WORKAROUNDS_H
 #define WORKAROUNDS_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QPalette;

src/plugins/valgrind/xmlprotocol/announcethread.cpp

@@ -35,8 +35,8 @@
 #include "announcethread.h"
 #include "frame.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QVector>
+#include <QSharedData>
+#include <QVector>
 
 #include <algorithm>
 

src/plugins/valgrind/xmlprotocol/announcethread.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H
 #define LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 template <typename T> class QVector;

src/plugins/valgrind/xmlprotocol/error.cpp

@@ -37,12 +37,12 @@
 #include "stack.h"
 #include "suppression.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QVector>
+#include <QSharedData>
+#include <QString>
+#include <QTextStream>
+#include <QVector>
 
-#include <QtCore/QtAlgorithms>
+#include <QtAlgorithms>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/error.h

@@ -35,8 +35,8 @@
 #ifndef LIBVALGRIND_PROTOCOL_ERROR_H
 #define LIBVALGRIND_PROTOCOL_ERROR_H
 
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QMetaType>
+#include <QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp

@@ -40,8 +40,8 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QVector>
+#include <QDir>
+#include <QVector>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/errorlistmodel.h

@@ -35,8 +35,8 @@
 #ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H
 #define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QSharedPointer>
+#include <QAbstractItemModel>
+#include <QSharedPointer>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/frame.cpp

@@ -34,8 +34,8 @@
 
 #include "frame.h"
 
-#include <QtCore/QString>
-#include <QtCore/QtAlgorithms>
+#include <QString>
+#include <QtAlgorithms>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/frame.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_FRAME_H
 #define LIBVALGRIND_PROTOCOL_FRAME_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/modelhelpers.cpp

@@ -35,10 +35,10 @@
 #include "modelhelpers.h"
 #include "frame.h"
 
-#include <QtCore/QString>
-#include <QtCore/QDir>
-#include <QtCore/QPair>
-#include <QtCore/QCoreApplication>
+#include <QString>
+#include <QDir>
+#include <QPair>
+#include <QCoreApplication>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/modelhelpers.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_MODELHELPERS_H
 #define LIBVALGRIND_PROTOCOL_MODELHELPERS_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/plugins/valgrind/xmlprotocol/parser.cpp

@@ -41,13 +41,13 @@
 #include "suppression.h"
 #include <utils/qtcassert.h>
 
-#include <QtNetwork/QAbstractSocket>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QHash>
-#include <QtCore/QIODevice>
-#include <QtCore/QPair>
-#include <QtCore/QThread>
-#include <QtCore/QXmlStreamReader>
+#include <QAbstractSocket>
+#include <QCoreApplication>
+#include <QHash>
+#include <QIODevice>
+#include <QPair>
+#include <QThread>
+#include <QXmlStreamReader>
 
 namespace {
 

src/plugins/valgrind/xmlprotocol/parser.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_PARSER_H
 #define LIBVALGRIND_PROTOCOL_PARSER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QIODevice;

src/plugins/valgrind/xmlprotocol/stack.cpp

@@ -35,9 +35,9 @@
 #include "stack.h"
 #include "frame.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QSharedData>
+#include <QString>
+#include <QVector>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/stack.h

@@ -35,7 +35,7 @@
 #ifndef VALGRIND_PROTOCOL_STACK_H
 #define VALGRIND_PROTOCOL_STACK_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 template <typename T> class QVector;

src/plugins/valgrind/xmlprotocol/stackmodel.cpp

@@ -40,8 +40,8 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QVector>
+#include <QDir>
+#include <QVector>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/stackmodel.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_STACKMODEL_H
 #define LIBVALGRIND_PROTOCOL_STACKMODEL_H
 
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/status.cpp

@@ -34,8 +34,8 @@
 
 #include "status.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
+#include <QSharedData>
+#include <QString>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/status.h

@@ -35,8 +35,8 @@
 #ifndef LIBVALGRIND_PROTOCOL_STATUS_H
 #define LIBVALGRIND_PROTOCOL_STATUS_H
 
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QMetaType>
+#include <QSharedDataPointer>
 
 namespace Valgrind {
 namespace XmlProtocol {

src/plugins/valgrind/xmlprotocol/suppression.cpp

@@ -34,10 +34,10 @@
 
 #include "suppression.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QTextStream>
+#include <QSharedData>
+#include <QString>
+#include <QVector>
+#include <QTextStream>
 
 #include <algorithm>
 

src/plugins/valgrind/xmlprotocol/suppression.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_SUPPRESSION_H
 #define LIBVALGRIND_PROTOCOL_SUPPRESSION_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/plugins/valgrind/xmlprotocol/threadedparser.cpp

@@ -40,9 +40,9 @@
 #include "suppression.h"
 #include <utils/qtcassert.h>
 
-#include <QtCore/QMetaType>
-#include <QtCore/QThread>
-#include <QtCore/QSharedPointer>
+#include <QMetaType>
+#include <QThread>
+#include <QSharedPointer>
 
 namespace {
 

src/plugins/valgrind/xmlprotocol/threadedparser.h

@@ -35,7 +35,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_THREADEDPARSER_H
 #define LIBVALGRIND_PROTOCOL_THREADEDPARSER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QIODevice;