Clean headers in Qt4ProjectManager.

Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Friedemann Kleint
2013-03-28 10:15:09 +01:00
parent 79e48237d6
commit c0b6d1d3f2
68 changed files with 2 additions and 271 deletions

View File

@@ -30,7 +30,6 @@
#include "classdefinition.h" #include "classdefinition.h"
#include <QFileInfo> #include <QFileInfo>
#include <QFileDialog>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -35,8 +35,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QStandardItem> #include <QStandardItem>
#include <QLabel>
#include <QToolButton>
#include <QDebug> #include <QDebug>
#include <QRegExp> #include <QRegExp>

View File

@@ -29,7 +29,6 @@
#include "customwidgetpluginwizardpage.h" #include "customwidgetpluginwizardpage.h"
#include "customwidgetwidgetswizardpage.h" #include "customwidgetwidgetswizardpage.h"
#include "pluginoptions.h"
#include "ui_customwidgetpluginwizardpage.h" #include "ui_customwidgetpluginwizardpage.h"
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -29,12 +29,10 @@
#include "customwidgetwidgetswizardpage.h" #include "customwidgetwidgetswizardpage.h"
#include "ui_customwidgetwidgetswizardpage.h" #include "ui_customwidgetwidgetswizardpage.h"
#include "plugingenerator.h"
#include "classdefinition.h" #include "classdefinition.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <QFileInfo>
#include <QTimer> #include <QTimer>
#include <QStackedLayout> #include <QStackedLayout>

View File

@@ -30,8 +30,8 @@
#include "customwidgetwizard.h" #include "customwidgetwizard.h"
#include "customwidgetwizarddialog.h" #include "customwidgetwizarddialog.h"
#include "plugingenerator.h" #include "plugingenerator.h"
#include "pluginoptions.h"
#include "filenamingparameters.h" #include "filenamingparameters.h"
#include "pluginoptions.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>

View File

@@ -30,12 +30,9 @@
#include "customwidgetwizarddialog.h" #include "customwidgetwizarddialog.h"
#include "customwidgetwidgetswizardpage.h" #include "customwidgetwidgetswizardpage.h"
#include "customwidgetpluginwizardpage.h" #include "customwidgetpluginwizardpage.h"
#include "customwidgetwizard.h" #include "pluginoptions.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/kitmanager.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>

View File

@@ -37,11 +37,9 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h>
#include <designer/designerconstants.h> #include <designer/designerconstants.h>
#include <QProcess> #include <QProcess>
#include <QFileInfo>
#include <QDebug> #include <QDebug>
#include <QSignalMapper> #include <QSignalMapper>

View File

@@ -39,7 +39,6 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/buildconfiguration.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QFileInfo> #include <QFileInfo>

View File

@@ -30,7 +30,6 @@
#ifndef LIBRARYDETAILSCONTROLLER_H #ifndef LIBRARYDETAILSCONTROLLER_H
#define LIBRARYDETAILSCONTROLLER_H #define LIBRARYDETAILSCONTROLLER_H
#include <QWidget>
#include "addlibrarywizard.h" #include "addlibrarywizard.h"
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -40,13 +40,8 @@
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/gnumakeparser.h> #include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/task.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <qtsupport/qtparser.h>
#include <qtsupport/qtkitinformation.h>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>

View File

@@ -33,7 +33,6 @@
#include "qt4projectmanager_global.h" #include "qt4projectmanager_global.h"
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/abstractprocessstep.h>
#include <projectexplorer/buildstep.h>
namespace ProjectExplorer { namespace ProjectExplorer {
class BuildStep; class BuildStep;

View File

@@ -30,17 +30,11 @@
#include "profileeditor.h" #include "profileeditor.h"
#include "profilehighlighter.h" #include "profilehighlighter.h"
#include "qt4projectmanager.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "profileeditorfactory.h" #include "profileeditorfactory.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <texteditor/fontsettings.h> #include <texteditor/fontsettings.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <QFileInfo> #include <QFileInfo>

View File

@@ -34,14 +34,9 @@
#include "profileeditor.h" #include "profileeditor.h"
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo>
#include <QAction>
#include <QMenu>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -32,10 +32,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <QRegExp>
#include <QColor>
#include <QTextDocument> #include <QTextDocument>
#include <QTextEdit>
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -31,16 +31,10 @@
#include "profileeditor.h" #include "profileeditor.h"
#include "profilecompletionassist.h" #include "profilecompletionassist.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/helpitem.h>
#include <utils/htmldocextractor.h> #include <utils/htmldocextractor.h>
#include <QTextCursor>
#include <QTextBlock> #include <QTextBlock>
#include <QUrl> #include <QUrl>

View File

@@ -29,12 +29,8 @@
#include "qmakekitconfigwidget.h" #include "qmakekitconfigwidget.h"
#include "qt4projectmanagerconstants.h"
#include "qmakekitinformation.h" #include "qmakekitinformation.h"
#include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QLineEdit> #include <QLineEdit>

View File

@@ -35,7 +35,6 @@
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchainmanager.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -28,11 +28,9 @@
****************************************************************************/ ****************************************************************************/
#include "qmakeparser.h" #include "qmakeparser.h"
#include "qt4projectmanagerconstants.h"
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -30,8 +30,6 @@
#include "qmakerunconfigurationfactory.h" #include "qmakerunconfigurationfactory.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/target.h>
#include <qtsupport/customexecutablerunconfiguration.h>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -30,39 +30,28 @@
#include "qmakestep.h" #include "qmakestep.h"
#include "ui_qmakestep.h" #include "ui_qmakestep.h"
#include <projectexplorer/projectexplorerconstants.h>
#include "qmakeparser.h" #include "qmakeparser.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qt4projectmanager.h"
#include "qmakekitinformation.h" #include "qmakekitinformation.h"
#include "qt4nodes.h" #include "qt4nodes.h"
#include <utils/fileutils.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/messagemanager.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <qtsupport/debugginghelperbuildtask.h> #include <qtsupport/debugginghelperbuildtask.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QDir> #include <QDir>
#include <QFile>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <QtConcurrentRun>
#include <QMessageBox> #include <QMessageBox>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;

View File

@@ -28,15 +28,11 @@
****************************************************************************/ ****************************************************************************/
#include "desktopqtversion.h" #include "desktopqtversion.h"
#include "../qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h>
#include <coreplugin/featureprovider.h> #include <coreplugin/featureprovider.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir>
#include <QFileInfoList>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -28,9 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "desktopqtversionfactory.h" #include "desktopqtversionfactory.h"
#include "desktopqtversion.h" #include "desktopqtversion.h"
#include "../qt4projectmanagerconstants.h"
#include <qtsupport/qtversionmanager.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <QFileInfo> #include <QFileInfo>

View File

@@ -29,39 +29,24 @@
#include "qt4runconfiguration.h" #include "qt4runconfiguration.h"
#include "../makestep.h"
#include "../qt4nodes.h" #include "../qt4nodes.h"
#include "../qt4project.h" #include "../qt4project.h"
#include "../qt4buildconfiguration.h" #include "../qt4buildconfiguration.h"
#include "../qt4projectmanagerconstants.h"
#include "../qmakestep.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/variablemanager.h>
#include <coreplugin/idocument.h>
#include <coreplugin/helpmanager.h>
#include <projectexplorer/buildstep.h>
#include <projectexplorer/environmentwidget.h> #include <projectexplorer/environmentwidget.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtoutputformatter.h> #include <qtsupport/qtoutputformatter.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/profilereader.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <QFormLayout> #include <QFormLayout>
#include <QInputDialog>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QCheckBox> #include <QCheckBox>

View File

@@ -37,7 +37,6 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <QStringList> #include <QStringList>
#include <QMetaType>
#include <QLabel> #include <QLabel>
#include <QWidget> #include <QWidget>

View File

@@ -28,15 +28,11 @@
****************************************************************************/ ****************************************************************************/
#include "simulatorqtversion.h" #include "simulatorqtversion.h"
#include "qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <proparser/profileevaluator.h>
#include <coreplugin/featureprovider.h> #include <coreplugin/featureprovider.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDir>
#include <QFileInfoList>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "simulatorqtversionfactory.h" #include "simulatorqtversionfactory.h"
#include "qt4projectmanagerconstants.h"
#include "simulatorqtversion.h" #include "simulatorqtversion.h"
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>

View File

@@ -37,7 +37,6 @@
#include "makestep.h" #include "makestep.h"
#include "buildconfigurationinfo.h" #include "buildconfigurationinfo.h"
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <limits> #include <limits>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
@@ -45,10 +44,6 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/kitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionfactory.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <qt4projectmanager/qmakekitinformation.h> #include <qt4projectmanager/qmakekitinformation.h>

View File

@@ -32,13 +32,10 @@
#include "qt4projectmanager.h" #include "qt4projectmanager.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qtuicodemodelsupport.h" #include "qtuicodemodelsupport.h"
#include "qmakestep.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "qmakerunconfigurationfactory.h" #include "qmakerunconfigurationfactory.h"
#include <projectexplorer/nodesvisitor.h> #include <projectexplorer/nodesvisitor.h>
#include <projectexplorer/runconfiguration.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/fileiconprovider.h> #include <coreplugin/fileiconprovider.h>
@@ -47,34 +44,24 @@
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <cpptools/ModelManagerInterface.h>
#include <cplusplus/CppDocument.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/profilereader.h> #include <qtsupport/profilereader.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <utils/fileutils.h>
#include <proparser/prowriter.h> #include <proparser/prowriter.h>
#include <utils/fileutils.h>
#include <algorithm> #include <algorithm>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QCoreApplication>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QPainter>
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton>
#include <utils/QtConcurrentTools> #include <utils/QtConcurrentTools>
// Static cached data in struct Qt4NodeStaticData providing information and icons // Static cached data in struct Qt4NodeStaticData providing information and icons

View File

@@ -30,53 +30,32 @@
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanager.h" #include "qt4projectmanager.h"
#include "makestep.h"
#include "qmakestep.h" #include "qmakestep.h"
#include "qmakerunconfigurationfactory.h"
#include "qt4nodes.h" #include "qt4nodes.h"
#include "qt4projectconfigwidget.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "findqt4profiles.h" #include "findqt4profiles.h"
#include "buildconfigurationinfo.h" #include "buildconfigurationinfo.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/documentmanager.h> #include <coreplugin/documentmanager.h>
#include <coreplugin/variablemanager.h>
#include <extensionsystem/pluginmanager.h>
#include <cpptools/ModelManagerInterface.h> #include <cpptools/ModelManagerInterface.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljstools/qmljsmodelmanager.h> #include <qmljstools/qmljsmodelmanager.h>
#include <projectexplorer/buildtargetinfo.h> #include <projectexplorer/buildtargetinfo.h>
#include <projectexplorer/deploymentdata.h> #include <projectexplorer/deploymentdata.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmacroexpander.h> #include <projectexplorer/projectmacroexpander.h>
#include <utils/qtcassert.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qmldumptool.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/profilereader.h> #include <qtsupport/profilereader.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/QtConcurrentTools>
#include <utils/stringutils.h>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QFileDialog>
#include <QInputDialog>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -36,7 +36,6 @@
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <QStringList> #include <QStringList>
#include <QMap>
#include <QFutureInterface> #include <QFutureInterface>
#include <QTimer> #include <QTimer>
#include <QFuture> #include <QFuture>

View File

@@ -29,33 +29,14 @@
#include "qt4projectconfigwidget.h" #include "qt4projectconfigwidget.h"
#include "makestep.h"
#include "qmakestep.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include "qt4projectmanager.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "qt4nodes.h" #include "qt4nodes.h"
#include "ui_qt4projectconfigwidget.h" #include "ui_qt4projectconfigwidget.h"
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/task.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/buildconfiguration.h>
#include <qtsupport/qtversionfactory.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <extensionsystem/pluginmanager.h>
#include <QPushButton>
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;

View File

@@ -40,24 +40,12 @@
#include "wizards/qtquickapp.h" #include "wizards/qtquickapp.h"
#include "wizards/html5app.h" #include "wizards/html5app.h"
#include <coreplugin/icore.h>
#include <coreplugin/basefilewizard.h>
#include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <qtsupport/profilereader.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h>
#include <QCoreApplication>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QVariant> #include <QVariant>

View File

@@ -48,7 +48,6 @@
#include "profilehoverhandler.h" #include "profilehoverhandler.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qt4project.h" #include "qt4project.h"
#include "profileeditor.h"
#include "externaleditors.h" #include "externaleditors.h"
#include "profilecompletionassist.h" #include "profilecompletionassist.h"
#include "qt-desktop/qt4runconfiguration.h" #include "qt-desktop/qt4runconfiguration.h"
@@ -58,25 +57,16 @@
#include "unconfiguredprojectpanel.h" #include "unconfiguredprojectpanel.h"
#include "qmakekitinformation.h" #include "qmakekitinformation.h"
#include <coreplugin/id.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
@@ -85,7 +75,6 @@
#endif #endif
#include <QtPlugin> #include <QtPlugin>
#include <QMenu>
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;

View File

@@ -34,7 +34,6 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitoptionspage.h> #include <projectexplorer/kitoptionspage.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>

View File

@@ -28,10 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include "qtmodulesinfo.h" #include "qtmodulesinfo.h"
#include "qglobal.h"
#include <QDebug> #include <QDebug>
#include <QString> #include <QString>
#include <QHash>
#include <QCoreApplication> #include <QCoreApplication>
using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager::Internal;

View File

@@ -31,9 +31,7 @@
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanager.h"
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;

View File

@@ -32,7 +32,6 @@
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanager.h"
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -40,13 +39,9 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <QLabel>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>
#include <QDialogButtonBox> #include <QDialogButtonBox>

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "winceqtversion.h" #include "winceqtversion.h"
#include "qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QStringList> #include <QStringList>

View File

@@ -29,7 +29,6 @@
#include "abstractmobileapp.h" #include "abstractmobileapp.h"
#include <QCoreApplication>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>

View File

@@ -29,22 +29,17 @@
#include "abstractmobileappwizard.h" #include "abstractmobileappwizard.h"
#include "abstractmobileapp.h"
#include "mobileappwizardpages.h" #include "mobileappwizardpages.h"
#include "targetsetuppage.h" #include "targetsetuppage.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <qt4projectmanager/qt4project.h> #include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanager.h> #include <qt4projectmanager/qt4projectmanager.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/customwizard/customwizard.h> #include <projectexplorer/customwizard/customwizard.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <utils/qtcassert.h>
#include <QIcon>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -30,7 +30,6 @@
#include "consoleappwizard.h" #include "consoleappwizard.h"
#include "consoleappwizarddialog.h" #include "consoleappwizarddialog.h"
#include "qt4projectmanagerconstants.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/abstracteditorsupport.h> #include <cpptools/abstracteditorsupport.h>

View File

@@ -28,8 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "consoleappwizarddialog.h" #include "consoleappwizarddialog.h"
#include "consoleappwizard.h"
#include <coreplugin/basefilewizard.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <QDebug> #include <QDebug>

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "emptyprojectwizarddialog.h" #include "emptyprojectwizarddialog.h"
#include "qtprojectparameters.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -34,7 +34,6 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/abstracteditorsupport.h> #include <cpptools/abstracteditorsupport.h>
#include <designer/cpp/formclasswizardparameters.h> #include <designer/cpp/formclasswizardparameters.h>
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <extensionsystem/invoker.h> #include <extensionsystem/invoker.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
@@ -42,9 +41,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QDir> #include <QDir>
#include <QFile>
#include <QTextStream> #include <QTextStream>
#include <QUuid>
#include <QFileInfo> #include <QFileInfo>
#include <QSharedPointer> #include <QSharedPointer>

View File

@@ -30,12 +30,10 @@
#include "guiappwizarddialog.h" #include "guiappwizarddialog.h"
#include "filespage.h" #include "filespage.h"
#include "qtprojectparameters.h"
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <QSet>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -31,7 +31,6 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QRegExp>
#include <QTextStream> #include <QTextStream>
#include <QCoreApplication> #include <QCoreApplication>

View File

@@ -32,9 +32,6 @@
#include "abstractmobileapp.h" #include "abstractmobileapp.h"
#include <QHash>
#include <QStringList>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "html5appwizard.h" #include "html5appwizard.h"
#include "mobileappwizardpages.h"
#include "html5app.h" #include "html5app.h"
#include "html5appwizardpages.h" #include "html5appwizardpages.h"
@@ -40,7 +39,6 @@
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <limits> #include <limits>
#include <QCoreApplication>
#include <QIcon> #include <QIcon>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -29,11 +29,6 @@
#include "html5appwizardpages.h" #include "html5appwizardpages.h"
#include "ui_html5appwizardsourcespage.h" #include "ui_html5appwizardsourcespage.h"
#include <coreplugin/coreconstants.h>
#include <QDesktopServices>
#include <QFileDialog>
#include <QMessageBox>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -31,9 +31,6 @@
#include <utils/detailswidget.h> #include <utils/detailswidget.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/fileutils.h>
#include <QFileInfo>
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>

View File

@@ -29,16 +29,12 @@
#include "librarywizard.h" #include "librarywizard.h"
#include "librarywizarddialog.h" #include "librarywizarddialog.h"
#include "qt4projectmanager.h"
#include "qt4projectmanagerconstants.h"
#include "mobilelibraryparameters.h" #include "mobilelibraryparameters.h"
#include <utils/codegeneration.h>
#include <cpptools/abstracteditorsupport.h> #include <cpptools/abstracteditorsupport.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QTextStream> #include <QTextStream>
#include <QIcon> #include <QIcon>

View File

@@ -33,16 +33,11 @@
#include "modulespage.h" #include "modulespage.h"
#include "mobilelibrarywizardoptionpage.h" #include "mobilelibrarywizardoptionpage.h"
#include "mobilelibraryparameters.h" #include "mobilelibraryparameters.h"
#include "abstractmobileapp.h"
#include "qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h>
#include <utils/projectintropage.h> #include <utils/projectintropage.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <QDebug> #include <QDebug>
#include <QDir>
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>

View File

@@ -31,7 +31,6 @@
#define LIBRARYWIZARDDIALOG_H #define LIBRARYWIZARDDIALOG_H
#include "qtwizard.h" #include "qtwizard.h"
#include "qtprojectparameters.h"
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -29,11 +29,6 @@
#include "mobileapp.h" #include "mobileapp.h"
#include <coreplugin/icore.h>
#include <QDir>
#include <QFile>
#include <QRegExp>
#include <QTextStream> #include <QTextStream>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -29,13 +29,11 @@
#include "mobileappwizard.h" #include "mobileappwizard.h"
#include "mobileappwizardpages.h"
#include "mobileapp.h" #include "mobileapp.h"
#include "targetsetuppage.h" #include "targetsetuppage.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/task.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>

View File

@@ -31,11 +31,9 @@
#include "ui_mobileappwizardgenericoptionspage.h" #include "ui_mobileappwizardgenericoptionspage.h"
#include "ui_mobileappwizardmaemooptionspage.h" #include "ui_mobileappwizardmaemooptionspage.h"
#include "ui_mobileappwizardharmattanoptionspage.h" #include "ui_mobileappwizardharmattanoptionspage.h"
#include <coreplugin/coreconstants.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QDesktopServices>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>

View File

@@ -28,10 +28,8 @@
****************************************************************************/ ****************************************************************************/
#include "mobilelibraryparameters.h" #include "mobilelibraryparameters.h"
#include "qtprojectparameters.h"
#include <QTextStream> #include <QTextStream>
#include <QDir>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -31,12 +31,6 @@
#include "ui_mobilelibrarywizardoptionpage.h" #include "ui_mobilelibrarywizardoptionpage.h"
#include "qtprojectparameters.h" #include "qtprojectparameters.h"
#include <coreplugin/coreconstants.h>
#include <QDesktopServices>
#include <QFileDialog>
#include <QMessageBox>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -31,10 +31,7 @@
#include "qtmodulesinfo.h" #include "qtmodulesinfo.h"
#include <utils/qtcassert.h>
#include <QDebug> #include <QDebug>
#include <QVariant>
#include <QCheckBox> #include <QCheckBox>
#include <QLabel> #include <QLabel>

View File

@@ -31,9 +31,7 @@
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
#include <QRegExp>
#include <QTextStream> #include <QTextStream>
#include <QCoreApplication>
#ifndef CREATORLESSTEST #ifndef CREATORLESSTEST
#include <coreplugin/icore.h> #include <coreplugin/icore.h>

View File

@@ -32,9 +32,6 @@
#include "abstractmobileapp.h" #include "abstractmobileapp.h"
#include <QHash>
#include <QStringList>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "qtquickappwizard.h" #include "qtquickappwizard.h"
#include "mobileappwizardpages.h"
#include "qtquickapp.h" #include "qtquickapp.h"
#include "qtquickappwizardpages.h" #include "qtquickappwizardpages.h"
@@ -38,9 +37,7 @@
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/dialogs/iwizard.h>
#include <QCoreApplication>
#include <QIcon> #include <QIcon>
#include <QDebug> #include <QDebug>

View File

@@ -29,11 +29,6 @@
#include "qtquickappwizardpages.h" #include "qtquickappwizardpages.h"
#include "ui_qtquickcomponentsetoptionspage.h" #include "ui_qtquickcomponentsetoptionspage.h"
#include <coreplugin/coreconstants.h>
#include <QDesktopServices>
#include <QFileDialog>
#include <QMessageBox>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {

View File

@@ -30,8 +30,6 @@
#ifndef QTQUICKAPPWIZARDPAGES_H #ifndef QTQUICKAPPWIZARDPAGES_H
#define QTQUICKAPPWIZARDPAGES_H #define QTQUICKAPPWIZARDPAGES_H
#include "qtquickapp.h"
#include <QWizardPage> #include <QWizardPage>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -36,13 +36,10 @@
#include "targetsetuppage.h" #include "targetsetuppage.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/task.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>

View File

@@ -34,10 +34,6 @@
#include <projectexplorer/baseprojectwizarddialog.h> #include <projectexplorer/baseprojectwizarddialog.h>
#include <projectexplorer/customwizard/customwizard.h> #include <projectexplorer/customwizard/customwizard.h>
#include <coreplugin/basefilewizard.h>
#include <QSet>
namespace ProjectExplorer { class Kit; } namespace ProjectExplorer { class Kit; }
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
#include "subdirsprojectwizarddialog.h" #include "subdirsprojectwizarddialog.h"
#include "qtprojectparameters.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

View File

@@ -34,13 +34,11 @@
#include "buildconfigurationinfo.h" #include "buildconfigurationinfo.h"
#include "qt4buildconfiguration.h" #include "qt4buildconfiguration.h"
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include "qmakekitinformation.h" #include "qmakekitinformation.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionfactory.h> #include <qtsupport/qtversionfactory.h>
@@ -49,11 +47,6 @@
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHeaderView>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout> #include <QVBoxLayout>