Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator

src/plugins/android/androidconfigurations.h

@@ -34,6 +34,7 @@
 #include <QString>
 #include <QVector>
 #include <projectexplorer/abi.h>
+#include <utils/fileutils.h>
 
 QT_BEGIN_NAMESPACE
 class QSettings;

src/plugins/android/androiddebugsupport.cpp

@@ -41,6 +41,7 @@
 #include <debugger/debuggerstartparameters.h>
 
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>

src/plugins/android/androiddeployconfiguration.cpp

@@ -36,6 +36,7 @@
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 
 #include <qt4projectmanager/qt4project.h>
 #include <qtsupport/qtkitinformation.h>

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -40,12 +40,14 @@
 #include "makefileparserthread.h"
 
 #include <projectexplorer/abi.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/headerpath.h>
 #include <extensionsystem/pluginmanager.h>
 #include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>

src/plugins/debugger/debuggerdialogs.cpp

@@ -35,6 +35,7 @@
 #include "cdb/cdbengine.h"
 
 #include <coreplugin/icore.h>
+#include <projectexplorer/toolchain.h>
 #include <utils/pathchooser.h>
 #include <utils/fancylineedit.h>
 #include <utils/qtcassert.h>

src/plugins/debugger/debuggerkitinformation.cpp

@@ -33,6 +33,7 @@
 
 #include <projectexplorer/abi.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
 #include <utils/environment.h>

src/plugins/debugger/debuggerplugin.cpp

@@ -82,6 +82,7 @@
 
 #include <projectexplorer/localapplicationrunconfiguration.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/devicesupport/deviceprocesslist.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/debugger/gdb/startgdbserverdialog.cpp

@@ -36,6 +36,7 @@
 #include "debuggerstartparameters.h"
 
 #include <projectexplorer/kitchooser.h>
+#include <projectexplorer/devicesupport/deviceprocesslist.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 #include <ssh/sshremoteprocessrunner.h>

src/plugins/debugger/logwindow.cpp

@@ -50,6 +50,7 @@
 
 #include <utils/savedaction.h>
 #include <utils/fancylineedit.h>
+#include <utils/fileutils.h>
 
 namespace Debugger {
 namespace Internal {

src/plugins/genericprojectmanager/genericprojectnodes.cpp

@@ -30,6 +30,7 @@
 #include "genericprojectnodes.h"
 #include "genericproject.h"
 
+#include <utils/fileutils.h>
 #include <coreplugin/idocument.h>
 #include <projectexplorer/projectexplorer.h>
 

src/plugins/madde/maemopublisherfremantlefree.cpp

@@ -38,6 +38,7 @@
 #include <coreplugin/idocument.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/toolchain.h>
 #include <qt4projectmanager/qmakestep.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qtsupport/baseqtversion.h>

src/plugins/projectexplorer/abi.cpp

@@ -29,7 +29,8 @@
 
 #include "abi.h"
 
-#include <QCoreApplication>
+#include <utils/fileutils.h>
+
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>

src/plugins/projectexplorer/abi.h

@@ -32,10 +32,10 @@
 
 #include "projectexplorer_export.h"
 
-#include <utils/fileutils.h>
-
 #include <QList>
 
+namespace Utils { class FileName; }
+
 namespace ProjectExplorer {
 
 // --------------------------------------------------------------------------

src/plugins/projectexplorer/abstractmsvctoolchain.cpp

@@ -33,14 +33,10 @@
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorersettings.h>
-#include <projectexplorer/gcctoolchain.h>
 
-
-#include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
 #include <utils/synchronousprocess.h>
 
-#include <QFileInfo>
 #include <QDir>
 #include <QTemporaryFile>
 

src/plugins/projectexplorer/abstractmsvctoolchain.h

@@ -32,8 +32,10 @@
 
 #include "toolchain.h"
 #include "abi.h"
+#include "headerpath.h"
 
 #include <utils/environment.h>
+#include <utils/fileutils.h>
 
 namespace ProjectExplorer {
 namespace Internal {

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -29,17 +29,14 @@
 
 #include "abstractprocessstep.h"
 #include "ansifilterparser.h"
-#include "buildconfiguration.h"
 #include "buildstep.h"
 #include "ioutputparser.h"
 #include "project.h"
-#include "target.h"
 #include "task.h"
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
-#include <QEventLoop>
 #include <QTimer>
 #include <QDir>
 

src/plugins/projectexplorer/allprojectsfilter.cpp

@@ -32,8 +32,6 @@
 #include "session.h"
 #include "project.h"
 
-#include <QVariant>
-
 using namespace Core;
 using namespace Locator;
 using namespace ProjectExplorer;

src/plugins/projectexplorer/allprojectsfilter.h

@@ -33,7 +33,6 @@
 #include <locator/basefilefilter.h>
 
 #include <QFutureInterface>
-#include <QString>
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/allprojectsfind.cpp

@@ -34,16 +34,13 @@
 #include "projectexplorer.h"
 #include "editorconfiguration.h"
 
-#include <utils/qtcassert.h>
 #include <texteditor/itexteditor.h>
-#include <coreplugin/editormanager/editormanager.h>
 
 #include <QSettings>
 #include <QRegExp>
 
 #include <QGridLayout>
 #include <QLabel>
-#include <QHBoxLayout>
 
 using namespace Find;
 using namespace ProjectExplorer;

src/plugins/projectexplorer/applicationlauncher.cpp

@@ -40,14 +40,12 @@
 #include <utils/winutils.h>
 #endif
 
-#include <QTimer>
 #include <QTextCodec>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
 
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 

src/plugins/projectexplorer/appoutputpane.cpp

@@ -28,26 +28,21 @@
 ****************************************************************************/
 
 #include "appoutputpane.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 #include "runconfiguration.h"
 #include "session.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
+#include <coreplugin/outputwindow.h>
 #include <find/basetextfind.h>
-#include <aggregation/aggregate.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorsettings.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/invoker.h>
 
 #include <utils/qtcassert.h>
-#include <utils/outputformatter.h>
 
 #include <QAction>
 #include <QVBoxLayout>

src/plugins/projectexplorer/appoutputpane.h

@@ -30,15 +30,19 @@
 #ifndef APPOUTPUTPANE_H
 #define APPOUTPUTPANE_H
 
-#include <coreplugin/outputwindow.h>
 #include <coreplugin/ioutputpane.h>
 
+#include <utils/outputformat.h>
+
 QT_BEGIN_NAMESPACE
 class QTabWidget;
 class QToolButton;
 class QAction;
+class QPoint;
 QT_END_NAMESPACE
 
+namespace Core { class OutputWindow; }
+
 namespace ProjectExplorer {
 
 class RunControl;

src/plugins/projectexplorer/baseprojectwizarddialog.cpp

@@ -29,8 +29,6 @@
 
 #include "baseprojectwizarddialog.h"
 
-#include <coreplugin/basefilewizard.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/documentmanager.h>
 #include <utils/projectintropage.h>
 

src/plugins/projectexplorer/baseprojectwizarddialog.h

@@ -31,12 +31,9 @@
 #define BASEPROJECTWIZARDDIALOG_H
 
 #include "projectexplorer_export.h"
-#include <coreplugin/featureprovider.h>
 #include <coreplugin/basefilewizard.h>
 #include <utils/wizard.h>
 
-#include <QWizard>
-
 namespace Utils {
     class ProjectIntroPage;
 }

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -29,10 +29,8 @@
 
 #include "buildconfiguration.h"
 
-#include "buildmanager.h"
 #include "buildsteplist.h"
 #include "projectexplorer.h"
-#include "projectexplorerconstants.h"
 #include "kitmanager.h"
 #include "target.h"
 #include "project.h"
@@ -45,8 +43,6 @@
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
 
-#include <QProcess>
-
 static const char BUILD_STEP_LIST_COUNT[] = "ProjectExplorer.BuildConfiguration.BuildStepListCount";
 static const char BUILD_STEP_LIST_PREFIX[] = "ProjectExplorer.BuildConfiguration.BuildStepList.";
 static const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "ProjectExplorer.BuildConfiguration.ClearSystemEnvironment";

src/plugins/projectexplorer/buildconfiguration.h

@@ -35,8 +35,6 @@
 
 #include <utils/environment.h>
 
-#include <QStringList>
-
 namespace Utils {
 class AbstractMacroExpander;
 }

src/plugins/projectexplorer/buildenvironmentwidget.cpp

@@ -33,7 +33,6 @@
 #include "environmentwidget.h"
 
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 #include <QVBoxLayout>
 #include <QCheckBox>

src/plugins/projectexplorer/buildenvironmentwidget.h

@@ -30,7 +30,6 @@
 #ifndef BUILDENVIRONMENTWIDGET_H
 #define BUILDENVIRONMENTWIDGET_H
 
-#include <projectexplorer/buildstep.h>
 #include <projectexplorer/namedwidget.h>
 
 QT_BEGIN_NAMESPACE

src/plugins/projectexplorer/buildmanager.cpp

@@ -32,7 +32,6 @@
 #include "buildprogress.h"
 #include "buildsteplist.h"
 #include "compileoutputwindow.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "project.h"
 #include "projectexplorersettings.h"
@@ -45,13 +44,10 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <projectexplorer/session.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/qtcassert.h>
 
-#include <QDir>
 #include <QPointer>
 #include <QTime>
 #include <QTimer>
-#include <QMetaType>
 #include <QList>
 #include <QHash>
 #include <QFutureWatcher>

src/plugins/projectexplorer/buildprogress.cpp

@@ -34,6 +34,7 @@
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QFont>
 #include <QPixmap>
 #include <QDebug>

src/plugins/projectexplorer/buildprogress.h

@@ -34,7 +34,8 @@
 
 #include <QPointer>
 #include <QWidget>
-#include <QLabel>
+
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace ProjectExplorer {
 namespace Internal {

src/plugins/projectexplorer/buildsettingspropertiespage.cpp

@@ -28,22 +28,17 @@
 ****************************************************************************/
 
 #include "buildsettingspropertiespage.h"
-#include "buildstep.h"
 #include "buildstepspage.h"
 #include "project.h"
-#include "projectexplorerconstants.h"
 #include "target.h"
 #include "buildconfiguration.h"
 #include "buildconfigurationmodel.h"
 
-#include <coreplugin/coreconstants.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/buildmanager.h>
 
 #include <QMargins>
-#include <QTimer>
 #include <QCoreApplication>
 #include <QComboBox>
 #include <QInputDialog>

src/plugins/projectexplorer/buildsettingspropertiespage.h

@@ -33,7 +33,6 @@
 #include "iprojectproperties.h"
 
 #include <QWidget>
-#include <QIcon>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;

src/plugins/projectexplorer/buildstepspage.cpp

@@ -33,7 +33,6 @@
 #include "buildsteplist.h"
 #include "projectexplorerconstants.h"
 
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
@@ -42,7 +41,6 @@
 
 #include <QSignalMapper>
 
-#include <QPropertyAnimation>
 #include <QLabel>
 #include <QPushButton>
 #include <QMenu>
@@ -50,7 +48,6 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QMessageBox>
-#include <QGraphicsOpacityEffect>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;

src/plugins/projectexplorer/buildstepspage.h

@@ -31,7 +31,6 @@
 #define BUILDSTEPSPAGE_H
 
 #include "buildstep.h"
-#include "deployconfiguration.h"
 #include "namedwidget.h"
 #include <utils/detailsbutton.h>
 

src/plugins/projectexplorer/cesdkhandler.cpp

@@ -31,8 +31,8 @@
 
 #include <utils/environment.h>
 
-#include <QFile>
 #include <QDebug>
+#include <QFile>
 #include <QXmlStreamReader>
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/cesdkhandler.h

@@ -32,7 +32,6 @@
 
 #include <projectexplorer/projectexplorer.h>
 
-#include <QStringList>
 #include <QDir>
 
 namespace Utils {

src/plugins/projectexplorer/clangparser.cpp

@@ -29,7 +29,6 @@
 
 #include "clangparser.h"
 #include "ldparser.h"
-#include "taskwindow.h"
 #include "projectexplorerconstants.h"
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/codestylesettingspropertiespage.cpp

@@ -34,8 +34,6 @@
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/codestyleeditor.h>
 
-#include <QTextCodec>
-
 using namespace TextEditor;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;

src/plugins/projectexplorer/compileoutputwindow.cpp

@@ -31,25 +31,20 @@
 #include "buildmanager.h"
 #include "showoutputtaskhandler.h"
 #include "task.h"
-#include "projectexplorerconstants.h"
 #include "projectexplorer.h"
 #include "projectexplorersettings.h"
 #include "taskhub.h"
 
-#include <coreplugin/icontext.h>
+#include <coreplugin/outputwindow.h>
 #include <find/basetextfind.h>
-#include <aggregation/aggregate.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
 
-#include <QKeyEvent>
 #include <QIcon>
 #include <QTextCharFormat>
 #include <QTextBlock>
 #include <QTextCursor>
-#include <QTextEdit>
-#include <QScrollBar>
 #include <QPlainTextEdit>
 #include <QToolButton>
 

src/plugins/projectexplorer/compileoutputwindow.h

@@ -31,7 +31,6 @@
 #define COMPILEOUTPUTWINDOW_H
 
 #include "buildstep.h"
-#include <coreplugin/outputwindow.h>
 #include <coreplugin/ioutputpane.h>
 
 #include <QHash>

src/plugins/projectexplorer/copytaskhandler.cpp

@@ -30,12 +30,9 @@
 #include "copytaskhandler.h"
 
 #include "task.h"
-#include "taskwindow.h"
 
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 
-#include <QDir>
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>

src/plugins/projectexplorer/currentprojectfind.cpp

@@ -38,8 +38,6 @@
 
 #include <QDebug>
 #include <QSettings>
-#include <QLabel>
-#include <QHBoxLayout>
 
 using namespace Find;
 using namespace ProjectExplorer;

src/plugins/projectexplorer/customtoolchain.h

@@ -33,9 +33,12 @@
 #include "projectexplorer_export.h"
 
 #include "abi.h"
+#include "headerpath.h"
 #include "toolchain.h"
 #include "toolchainconfigwidget.h"
 
+#include <utils/fileutils.h>
+
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
 class QTextEdit;

src/plugins/projectexplorer/customwizard/customwizard.cpp

@@ -36,7 +36,6 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 

src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

@@ -39,7 +39,6 @@
 
 #include <QDebug>
 #include <QCoreApplication>
-#include <QLocale>
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>

src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp

@@ -32,7 +32,6 @@
 #include "customwizardparameters.h"
 
 #include <utils/hostosinfo.h>