diff options
Diffstat (limited to 'src/plugins/qt4projectmanager')
154 files changed, 417 insertions, 417 deletions
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp index d02d33b5b2..ecf4681e1c 100644 --- a/src/plugins/qt4projectmanager/addlibrarywizard.cpp +++ b/src/plugins/qt4projectmanager/addlibrarywizard.cpp @@ -34,12 +34,12 @@ #include "ui_librarydetailswidget.h" #include "librarydetailscontroller.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QRadioButton> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QRadioButton> +#include <QLabel> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDebug> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h index 53339ba0e6..b88be2817f 100644 --- a/src/plugins/qt4projectmanager/applicationlauncher.h +++ b/src/plugins/qt4projectmanager/applicationlauncher.h @@ -33,9 +33,9 @@ #ifndef APPLICATIONLAUNCHER_H #define APPLICATIONLAUNCHER_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QProcess> +#include <QObject> +#include <QStringList> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp index 5489dcead7..e32917ecdc 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp @@ -32,8 +32,8 @@ #include "classdefinition.h" -#include <QtCore/QFileInfo> -#include <QtGui/QFileDialog> +#include <QFileInfo> +#include <QFileDialog> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h index 057e3fd653..1ca21fad7a 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h @@ -37,7 +37,7 @@ #include "filenamingparameters.h" #include "pluginoptions.h" -#include <QtGui/QTabWidget> +#include <QTabWidget> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp index b6da9fff27..d60e4181f3 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp @@ -34,15 +34,15 @@ #include <utils/qtcassert.h> -#include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> - -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QKeyEvent> +#include <QMessageBox> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QLabel> +#include <QToolButton> + +#include <QDebug> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h index 103eb55d91..1c4d9a41f8 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h @@ -33,7 +33,7 @@ #ifndef CLASSLIST_H #define CLASSLIST_H -#include <QtGui/QListView> +#include <QListView> QT_FORWARD_DECLARE_CLASS(QModelIndex) diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h index a4b2a19690..3001fd4403 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h @@ -35,8 +35,8 @@ #include "filenamingparameters.h" -#include <QtGui/QWizardPage> -#include <QtCore/QSharedPointer> +#include <QWizardPage> +#include <QSharedPointer> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp index 023ee60d92..fd98fe1721 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp @@ -37,11 +37,11 @@ #include <coreplugin/coreconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QFileInfo> +#include <QTimer> -#include <QtGui/QStackedLayout> -#include <QtGui/QIcon> +#include <QStackedLayout> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h index c09a08668f..65761d7f5e 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h @@ -36,8 +36,8 @@ #include "pluginoptions.h" #include "filenamingparameters.h" -#include <QtCore/QList> -#include <QtGui/QWizardPage> +#include <QList> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QStackedLayout; diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp index 9547307dfc..bb03038198 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -40,7 +40,7 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h index 7d13215d4e..ff9cfd0da2 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h @@ -35,7 +35,7 @@ #include "../wizards/qtwizard.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h index 43e2ef57c2..9ee24ec736 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h @@ -33,8 +33,8 @@ #ifndef FILENAMINGPARAMETERS_H #define FILENAMINGPARAMETERS_H -#include <QtCore/QString> -#include <QtCore/QFileInfo> +#include <QString> +#include <QFileInfo> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp index d3500e92b2..ef3b72ae3f 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp @@ -39,9 +39,9 @@ #include <cpptools/abstracteditorsupport.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QSet> +#include <QFileInfo> +#include <QDir> +#include <QSet> static QString headerGuard(const QString &header) { diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h index dc6f7d40a5..a0ad14b074 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h @@ -33,10 +33,10 @@ #ifndef PLUGINGENERATOR_H #define PLUGINGENERATOR_H -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QMap> +#include <QObject> +#include <QString> +#include <QList> +#include <QMap> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h index ddea89ae27..b89dacc55b 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h +++ b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h @@ -33,8 +33,8 @@ #ifndef PLUGINOPTIONS_H #define PLUGINOPTIONS_H -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp index 64f3a85c4b..fc02094407 100644 --- a/src/plugins/qt4projectmanager/externaleditors.cpp +++ b/src/plugins/qt4projectmanager/externaleditors.cpp @@ -42,13 +42,13 @@ #include <qtsupport/qtversionmanager.h> #include <designer/designerconstants.h> -#include <QtCore/QProcess> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSignalMapper> +#include <QProcess> +#include <QFileInfo> +#include <QDebug> +#include <QSignalMapper> -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QTcpServer> +#include <QTcpSocket> +#include <QTcpServer> enum { debug = 0 }; diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h index af04346a43..fe20eb8116 100644 --- a/src/plugins/qt4projectmanager/externaleditors.h +++ b/src/plugins/qt4projectmanager/externaleditors.h @@ -36,8 +36,8 @@ #include <coreplugin/editormanager/iexternaleditor.h> #include <coreplugin/id.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <QStringList> +#include <QMap> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp index ba1e1d68b0..e889d4f8ee 100644 --- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp @@ -43,9 +43,9 @@ #include <projectexplorer/toolchain.h> #include <projectexplorer/buildconfiguration.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QFileInfo> +#include <QDir> +#include <QTextStream> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.h b/src/plugins/qt4projectmanager/librarydetailscontroller.h index e234a4eed8..ae7e4d6294 100644 --- a/src/plugins/qt4projectmanager/librarydetailscontroller.h +++ b/src/plugins/qt4projectmanager/librarydetailscontroller.h @@ -33,7 +33,7 @@ #ifndef LIBRARYDETAILSCONTROLLER_H #define LIBRARYDETAILSCONTROLLER_H -#include <QtGui/QWidget> +#include <QWidget> #include "addlibrarywizard.h" namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 4c10ab9ec8..4b5a05596c 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -47,8 +47,8 @@ #include <utils/qtcprocess.h> #include <qtsupport/qtparser.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDir> +#include <QFileInfo> using ExtensionSystem::PluginManager; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.cpp b/src/plugins/qt4projectmanager/profilecompletionassist.cpp index fc81a7b3ca..a6a1d8c99f 100644 --- a/src/plugins/qt4projectmanager/profilecompletionassist.cpp +++ b/src/plugins/qt4projectmanager/profilecompletionassist.cpp @@ -42,7 +42,7 @@ #include <cplusplus/Icons.h> -#include <QtGui/QTextCursor> +#include <QTextCursor> using namespace Qt4ProjectManager::Internal; using namespace TextEditor; diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.h b/src/plugins/qt4projectmanager/profilecompletionassist.h index 260e1e825f..64984b1d6c 100644 --- a/src/plugins/qt4projectmanager/profilecompletionassist.h +++ b/src/plugins/qt4projectmanager/profilecompletionassist.h @@ -38,7 +38,7 @@ #include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/iassistprocessor.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp index 78846a421e..239b20dd24 100644 --- a/src/plugins/qt4projectmanager/profileeditor.cpp +++ b/src/plugins/qt4projectmanager/profileeditor.cpp @@ -46,9 +46,9 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QMenu> +#include <QFileInfo> +#include <QDir> +#include <QMenu> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index 8475d4bccb..0366de390f 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -41,9 +41,9 @@ #include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditorsettings.h> -#include <QtCore/QFileInfo> -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QFileInfo> +#include <QAction> +#include <QMenu> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h index d3040b8c90..e89d759dd2 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.h +++ b/src/plugins/qt4projectmanager/profileeditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp index 123fc74c56..6ece4ef079 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.cpp +++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp @@ -33,10 +33,10 @@ #include "profilehighlighter.h" #include "profilekeywords.h" -#include <QtCore/QRegExp> -#include <QtGui/QColor> -#include <QtGui/QTextDocument> -#include <QtGui/QTextEdit> +#include <QRegExp> +#include <QColor> +#include <QTextDocument> +#include <QTextEdit> using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h index 3388b3aafd..d5f37b02e9 100644 --- a/src/plugins/qt4projectmanager/profilehighlighter.h +++ b/src/plugins/qt4projectmanager/profilehighlighter.h @@ -34,9 +34,9 @@ #define PROFILEHIGHLIGHTER_H #include <texteditor/syntaxhighlighter.h> -#include <QtCore/QtAlgorithms> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCharFormat> +#include <QtAlgorithms> +#include <QSyntaxHighlighter> +#include <QTextCharFormat> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp index cff9c6c928..c8cf77e4e7 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp +++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp @@ -44,9 +44,9 @@ #include <texteditor/tooltip/tooltip.h> #include <utils/htmldocextractor.h> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtCore/QUrl> +#include <QTextCursor> +#include <QTextBlock> +#include <QUrl> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.h b/src/plugins/qt4projectmanager/profilehoverhandler.h index a02fa4e340..3c87d295bc 100644 --- a/src/plugins/qt4projectmanager/profilehoverhandler.h +++ b/src/plugins/qt4projectmanager/profilehoverhandler.h @@ -35,7 +35,7 @@ #include <texteditor/basehoverhandler.h> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE class QUrl; diff --git a/src/plugins/qt4projectmanager/profilekeywords.h b/src/plugins/qt4projectmanager/profilekeywords.h index 21bc9f2fdc..e8229a4d51 100644 --- a/src/plugins/qt4projectmanager/profilekeywords.h +++ b/src/plugins/qt4projectmanager/profilekeywords.h @@ -33,7 +33,7 @@ #ifndef PROFILEKEYWORDS_H #define PROFILEKEYWORDS_H -#include <QtCore/QStringList> +#include <QStringList> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qmakeparser.h b/src/plugins/qt4projectmanager/qmakeparser.h index b25c005f53..71ddcc7e97 100644 --- a/src/plugins/qt4projectmanager/qmakeparser.h +++ b/src/plugins/qt4projectmanager/qmakeparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 2bddba4b9a..0a99e24105 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -57,11 +57,11 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> #include <utils/runextensions.h> -#include <QtCore/QtConcurrentRun> -#include <QtGui/QMessageBox> +#include <QtConcurrentRun> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 7a04f18b04..265147b728 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -37,7 +37,7 @@ #include <utils/fileutils.h> #include <projectexplorer/abstractprocessstep.h> -#include <QtCore/QStringList> +#include <QStringList> namespace ProjectExplorer { class BuildStep; diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp index b1d4a90708..1e5c31fd81 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp @@ -36,9 +36,9 @@ #include <qtsupport/qtsupportconstants.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfoList> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfoList> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp index e096b63886..e012c7f12b 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp @@ -37,7 +37,7 @@ #include <qtsupport/qtversionmanager.h> #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp index 6a45e437cc..e79bc1c93b 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp @@ -37,8 +37,8 @@ #include "qt4buildconfiguration.h" #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index f9a68cd64a..dcc3724aa4 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp @@ -44,10 +44,10 @@ #include <qtsupport/qtversionmanager.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QApplication> +#include <QStyle> +#include <QLabel> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 25f26f308b..ac1cf7f906 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -60,15 +60,15 @@ #include <qtsupport/baseqtversion.h> #include <qtsupport/profilereader.h> -#include <QtGui/QFormLayout> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> -#include <QtGui/QToolButton> -#include <QtGui/QComboBox> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> +#include <QFormLayout> +#include <QInputDialog> +#include <QLabel> +#include <QLineEdit> +#include <QCheckBox> +#include <QToolButton> +#include <QComboBox> +#include <QFileInfo> +#include <QDir> using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h index 00a0056330..483d6c92af 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h @@ -37,10 +37,10 @@ #include <utils/environment.h> -#include <QtCore/QStringList> -#include <QtCore/QMetaType> -#include <QtGui/QLabel> -#include <QtGui/QWidget> +#include <QStringList> +#include <QMetaType> +#include <QLabel> +#include <QWidget> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp index 0dd85c835c..dbf820d06c 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp @@ -38,7 +38,7 @@ #include <projectexplorer/customexecutablerunconfiguration.h> #include <projectexplorer/deployconfiguration.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp index 340936d4c3..162038aafc 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp @@ -42,8 +42,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/customexecutablerunconfiguration.h> -#include <QtGui/QApplication> -#include <QtGui/QStyle> +#include <QApplication> +#include <QStyle> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp index 141a910145..5d9af88b53 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp @@ -36,9 +36,9 @@ #include <qtsupport/qtsupportconstants.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfoList> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfoList> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp index a604c87685..0400b8542f 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp @@ -37,7 +37,7 @@ #include <qtsupport/qtsupportconstants.h> #include <qtsupport/profilereader.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.h b/src/plugins/qt4projectmanager/qt-s60/abldparser.h index 8e763946d3..fccf25feeb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp index 2e21d7ae62..da96341795 100644 --- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp @@ -33,7 +33,7 @@ #include "certificatepathchooser.h" #include "s60certificateinfo.h" -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp index ff5ca3dd93..7b433b33c1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp @@ -49,14 +49,14 @@ #include <symbianutils/symbiandevicemanager.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTimer> +#include <QDir> +#include <QFileInfo> +#include <QTimer> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QMessageBox> +#include <QMainWindow> -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp index c2922029b7..8333292302 100644 --- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp @@ -39,7 +39,7 @@ #include <projectexplorer/toolchainmanager.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDir> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp index f645a6a833..418101789d 100644 --- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp @@ -32,12 +32,12 @@ #include "passphraseforkeydialog.h" -#include <QtGui/QCheckBox> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QPushButton> -#include <QtGui/QVBoxLayout> +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QLabel> +#include <QLineEdit> +#include <QPushButton> +#include <QVBoxLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h index 85b90bfbeb..242f240b3b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h @@ -33,7 +33,7 @@ #ifndef PASSPHRASEFORKEYDIALOG_H #define PASSPHRASEFORKEYDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_FORWARD_DECLARE_CLASS(QCheckBox) QT_FORWARD_DECLARE_CLASS(QDialogButtonBox) diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp index 554c91958d..6c3107cdde 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.cpp @@ -47,8 +47,8 @@ #include <projectexplorer/toolchain.h> #include <symbianutils/symbiandevicemanager.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QPainter> -#include <QtGui/QApplication> +#include <QPainter> +#include <QApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h index 0923dd3d8c..5f4ef5519f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantarget.h @@ -35,7 +35,7 @@ #include "qt4target.h" -#include <QtGui/QPixmap> +#include <QPixmap> namespace Qt4ProjectManager { class Qt4Project; diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h index 4570c5da82..c13a10f395 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index 49a5e6a2a8..ae09bf3fff 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -42,11 +42,11 @@ #include <utils/environmentmodel.h> #include <utils/synchronousprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QProcess> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> +#include <QDir> +#include <QFileInfo> +#include <QProcess> +#include <QGridLayout> +#include <QLabel> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h index 7cec9f00b7..235959254f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h @@ -33,7 +33,7 @@ #ifndef S60CERTIFICATEDETAILSDIALOG_H #define S60CERTIFICATEDETAILSDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> struct S60CertificateDetailsDialogPrivate; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp index e66caccb30..fcc869948e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp @@ -33,12 +33,12 @@ #include "s60certificateinfo.h" #include "s60symbiancertificate.h" -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtCore/QHash> -#include <QtCore/QMutableHashIterator> +#include <QDateTime> +#include <QFileInfo> +#include <QCoreApplication> +#include <QTextStream> +#include <QHash> +#include <QMutableHashIterator> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h index ef85065b86..8c73e18d79 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.h @@ -33,9 +33,9 @@ #ifndef S60CERTIFICATEINFO_H #define S60CERTIFICATEINFO_H -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QtGlobal> +#include <QObject> +#include <QStringList> +#include <QtGlobal> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h index 96fec081e3..1df807014a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 2652e7cf63..123fa418e6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -57,12 +57,12 @@ #include <projectexplorer/gnumakeparser.h> #include <projectexplorer/task.h> -#include <QtCore/QDir> -#include <QtCore/QTimer> -#include <QtCore/QCryptographicHash> +#include <QDir> +#include <QTimer> +#include <QCryptographicHash> -#include <QtCore/QSettings> -#include <QtGui/QMessageBox> +#include <QSettings> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h index 90f2012e67..1b943d2dcc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h @@ -38,8 +38,8 @@ #include <projectexplorer/buildstep.h> #include <qt4projectmanager/makestep.h> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> +#include <QMutex> +#include <QWaitCondition> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index c0fb481aa5..f5ec79b453 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -50,7 +50,7 @@ #include <projectexplorer/project.h> #include <projectexplorer/toolchain.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp index b4ddb3904c..943700a0c6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp @@ -46,25 +46,25 @@ #include <utils/qtcassert.h> #include <utils/pathchooser.h> -#include <QtCore/QDir> -#include <QtCore/QTimer> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QComboBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QToolButton> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QSpacerItem> -#include <QtGui/QMessageBox> -#include <QtGui/QCheckBox> -#include <QtGui/QGroupBox> -#include <QtGui/QRadioButton> -#include <QtGui/QValidator> - -#include <QtNetwork/QTcpSocket> +#include <QDir> +#include <QTimer> +#include <QLabel> +#include <QLineEdit> +#include <QComboBox> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QFormLayout> +#include <QToolButton> +#include <QStyle> +#include <QApplication> +#include <QSpacerItem> +#include <QMessageBox> +#include <QCheckBox> +#include <QGroupBox> +#include <QRadioButton> +#include <QValidator> + +#include <QTcpSocket> Q_DECLARE_METATYPE(SymbianUtils::SymbianDevice) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h index 45b452b87f..09645a8d40 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h @@ -35,8 +35,8 @@ #include <projectexplorer/deployconfiguration.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 949086250a..1db4799c86 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -47,17 +47,17 @@ #include <symbianutils/symbiandevicemanager.h> #include <utils/qtcassert.h> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QMessageBox> +#include <QMainWindow> -#include <QtCore/QTimer> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QEventLoop> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QTimer> +#include <QDateTime> +#include <QDir> +#include <QEventLoop> +#include <QFile> +#include <QFileInfo> -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> using namespace ProjectExplorer; using namespace SymbianUtils; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h index ccea6a1b55..1ba08c8762 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h @@ -35,7 +35,7 @@ #include <projectexplorer/buildstep.h> -#include <QtCore/QString> +#include <QString> QT_FORWARD_DECLARE_CLASS(QEventLoop) QT_FORWARD_DECLARE_CLASS(QFile) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp index 8097234fb6..1f330d6317 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp @@ -44,7 +44,7 @@ #include <projectexplorer/buildconfiguration.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 2f0db5fad6..49a688ad7b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -36,8 +36,8 @@ #include <projectexplorer/runconfiguration.h> #include <qt4projectmanager/qt4projectmanager_global.h> -#include <QtCore/QFutureInterface> -#include <QtCore/QStringList> +#include <QFutureInterface> +#include <QStringList> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index 57742b073c..1da3a93ee0 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -38,11 +38,11 @@ #include <coreplugin/helpmanager.h> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> +#include <QLabel> +#include <QLineEdit> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QFormLayout> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h index 8bec123168..2677255476 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h @@ -33,8 +33,8 @@ #ifndef S60DEVICERUNCONFIGURATIONWIDGET_H #define S60DEVICERUNCONFIGURATIONWIDGET_H -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QWidget> +#include <QLabel> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index 54d151a40e..d6fd37d426 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -47,9 +47,9 @@ #include <qtsupport/qtoutputformatter.h> #include <qtsupport/baseqtversion.h> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFormLayout> +#include <QLabel> +#include <QVBoxLayout> +#include <QFormLayout> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h index 4bc00deda2..1ce10f83fd 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h @@ -36,8 +36,8 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/applicationlauncher.h> -#include <QtCore/QVariantMap> -#include <QtGui/QWidget> +#include <QVariantMap> +#include <QWidget> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index 3afa5cb682..703ea9df2b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -58,9 +58,9 @@ #include <debugger/debuggerconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QMainWindow> +#include <QMainWindow> -#include <QtCore/QDir> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.h b/src/plugins/qt4projectmanager/qt-s60/s60manager.h index 9a36f3b6dc..fc1ba2f4e2 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.h @@ -33,7 +33,7 @@ #ifndef S60MANAGER_H #define S60MANAGER_H -#include <QtCore/QObject> +#include <QObject> namespace ProjectExplorer { class ToolChain; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index 80b1d58d70..32c0fcc57e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -50,7 +50,7 @@ #include <utils/fileutils.h> #include <proparser/prowriter.h> -#include <QtCore/QProcess> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h index 54c693a377..be158be934 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.h @@ -32,8 +32,8 @@ #ifndef S60PUBLISHEROVI_H #define S60PUBLISHEROVI_H -#include <QtCore/QObject> -#include <QtGui/QColor> +#include <QObject> +#include <QColor> QT_BEGIN_NAMESPACE class QProcess; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp index 2d88138b23..fbda8a5d12 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp @@ -40,7 +40,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/toolchain.h> -#include <QtGui/QAbstractButton> +#include <QAbstractButton> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h index 62bdbb4d26..1c8be1bd10 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h @@ -33,7 +33,7 @@ #ifndef S60PUBLISHINGBUILDSETTINGSPAGEOVI_H #define S60PUBLISHINGBUILDSETTINGSPAGEOVI_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace ProjectExplorer { class Project; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp index 187d66ce35..0cb1f12e0b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.cpp @@ -33,10 +33,10 @@ #include "s60publisherovi.h" #include "ui_s60publishingresultspageovi.h" -#include <QtGui/QDesktopServices> -#include <QtGui/QAbstractButton> -#include <QtGui/QScrollBar> -#include <QtCore/QProcess> +#include <QDesktopServices> +#include <QAbstractButton> +#include <QScrollBar> +#include <QProcess> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp index 379f8c5ef8..19431c9dbf 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp @@ -35,7 +35,7 @@ #include "s60publisherovi.h" #include "s60certificateinfo.h" -#include <QtGui/QAbstractButton> +#include <QAbstractButton> using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h index db61b0acf6..f3a446595a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h @@ -33,7 +33,7 @@ #ifndef S60PUBLISHINGSISSETTINGSPAGEOVI_H #define S60PUBLISHINGSISSETTINGSPAGEOVI_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp index be16e88b55..30b6230b03 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp @@ -47,9 +47,9 @@ #include <coreplugin/icore.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QDir> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h index 616fa5f239..5b64516402 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.h @@ -37,7 +37,7 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/toolchain.h> -#include <QtCore/QFutureInterface> +#include <QFutureInterface> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp index 0cafbd0c9f..6494d379fc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp @@ -50,7 +50,7 @@ #include <memory> #include <string> -#include <QtCore/QDateTime> +#include <QDateTime> using namespace Botan; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h index 5134ef131d..8700ff4efc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h @@ -33,7 +33,7 @@ #ifndef S60SYMBIANCERTIFICATE_H #define S60SYMBIANCERTIFICATE_H -#include <QtCore/QStringList> +#include <QStringList> QT_FORWARD_DECLARE_CLASS(QDateTime) diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h index d1d20445f8..623d8fa3df 100644 --- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h +++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.h @@ -35,8 +35,8 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QDir> -#include <QtCore/QXmlStreamReader> +#include <QDir> +#include <QXmlStreamReader> namespace ProjectExplorer { class TaskHub; diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp index 6b408c2d60..a365ef9312 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp @@ -44,11 +44,11 @@ #include <utils/environment.h> #include <proparser/profileevaluator.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtGui/QLabel> -#include <QtGui/QFormLayout> +#include <QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QLabel> +#include <QFormLayout> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp index 40adcc588a..f4e9db3080 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp @@ -38,7 +38,7 @@ #include <qtsupport/profilereader.h> #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h index d254d61a05..2340993b9f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h @@ -35,7 +35,7 @@ #include <projectexplorer/ioutputparser.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp index 2bea7e92d3..533f078ca7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp @@ -42,9 +42,9 @@ #include <utils/environment.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QStringList> +#include <QDir> +#include <QFileInfo> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt4basetargetfactory.h b/src/plugins/qt4projectmanager/qt4basetargetfactory.h index 069e4e3d54..a93b2836aa 100644 --- a/src/plugins/qt4projectmanager/qt4basetargetfactory.h +++ b/src/plugins/qt4projectmanager/qt4basetargetfactory.h @@ -38,7 +38,7 @@ #include <projectexplorer/task.h> #include <projectexplorer/target.h> -#include <QtCore/QList> +#include <QList> namespace Core { class FeatureSet; diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index f95bab2979..92a72eb474 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -50,9 +50,9 @@ #include <qtsupport/qtversionfactory.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QInputDialog> +#include <QInputDialog> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index ae95dffcce..89fa1a6311 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -63,17 +63,17 @@ #include <proparser/prowriter.h> #include <algorithm> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamReader> - -#include <QtGui/QPainter> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QCoreApplication> +#include <QXmlStreamReader> + +#include <QPainter> +#include <QMainWindow> +#include <QMessageBox> +#include <QPushButton> #include <utils/QtConcurrentTools> // Static cached data in struct Qt4NodeStaticData providing information and icons diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h index cb25e4e13c..bb5ade1f77 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.h +++ b/src/plugins/qt4projectmanager/qt4nodes.h @@ -39,11 +39,11 @@ #include <coreplugin/ifile.h> #include <projectexplorer/projectnodes.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QDateTime> -#include <QtCore/QMap> -#include <QtCore/QFutureWatcher> +#include <QHash> +#include <QStringList> +#include <QDateTime> +#include <QMap> +#include <QFutureWatcher> // defined in proitems.h QT_BEGIN_NAMESPACE diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 29d4fc2088..c1abc4b0c1 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -66,11 +66,11 @@ #include <qtsupport/qtversionmanager.h> #include <utils/QtConcurrentTools> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileSystemWatcher> -#include <QtGui/QFileDialog> -#include <QtGui/QInputDialog> +#include <QDebug> +#include <QDir> +#include <QFileSystemWatcher> +#include <QFileDialog> +#include <QInputDialog> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 26dd0ab4a5..3b90ec039e 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -38,11 +38,11 @@ #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QFutureInterface> -#include <QtCore/QTimer> -#include <QtCore/QFuture> +#include <QStringList> +#include <QMap> +#include <QFutureInterface> +#include <QTimer> +#include <QFuture> QT_BEGIN_NAMESPACE struct ProFileOption; diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index 828cbcc371..614f109150 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -58,8 +58,8 @@ #include <utils/qtcprocess.h> #include <extensionsystem/pluginmanager.h> -#include <QtGui/QFileDialog> -#include <QtGui/QPushButton> +#include <QFileDialog> +#include <QPushButton> #include <utils/detailswidget.h> namespace { diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index 8a671b45f7..7671a3baf1 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -62,12 +62,12 @@ #include <qtsupport/baseqtversion.h> #include <qtsupport/qtversionmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QVariant> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QVariant> +#include <QFileDialog> +#include <QMessageBox> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_global.h b/src/plugins/qt4projectmanager/qt4projectmanager_global.h index 8d370aa49e..9ab1733c0c 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager_global.h +++ b/src/plugins/qt4projectmanager/qt4projectmanager_global.h @@ -33,7 +33,7 @@ #ifndef QT4PROJECTMANAGER_GLOBAL_H #define QT4PROJECTMANAGER_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(QT4PROJECTMANAGER_LIBRARY) # define QT4PROJECTMANAGER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index f34dd69022..39eb9c6d67 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -33,7 +33,7 @@ #ifndef QT4PROJECTMANAGERCONSTANTS_H #define QT4PROJECTMANAGERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Qt4ProjectManager { namespace Constants { diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index dc5da945a9..9b705c560b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -87,8 +87,8 @@ # include <QTest> #endif -#include <QtCore/QtPlugin> -#include <QtGui/QMenu> +#include <QtPlugin> +#include <QMenu> using namespace Qt4ProjectManager::Internal; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index dce6adbe01..8c58242179 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -59,15 +59,15 @@ #include <utils/detailswidget.h> #include <utils/qtcprocess.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QVBoxLayout> +#include <QCoreApplication> +#include <QPushButton> +#include <QMessageBox> +#include <QCheckBox> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QMainWindow> +#include <QVBoxLayout> #include <algorithm> diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index ecfe3f69ed..898458679d 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -39,7 +39,7 @@ #include <projectexplorer/target.h> #include <projectexplorer/task.h> -#include <QtGui/QSpacerItem> +#include <QSpacerItem> namespace Utils { class DetailsWidget; diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h b/src/plugins/qt4projectmanager/qt4targetsetupwidget.h index e1871176f8..a3f19c830e 100644 --- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h +++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.h @@ -35,7 +35,7 @@ #include "qt4projectmanager_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace Qt4ProjectManager { struct BuildConfigurationInfo; diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp index 78255726c4..a7e6bf3d2d 100644 --- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp +++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp @@ -32,10 +32,10 @@ #include "qtmodulesinfo.h" #include "qglobal.h" -#include <QtCore/QtDebug> -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QCoreApplication> +#include <QtDebug> +#include <QString> +#include <QHash> +#include <QCoreApplication> using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.h b/src/plugins/qt4projectmanager/qtmodulesinfo.h index b9b8f3eaf7..f7521237ac 100644 --- a/src/plugins/qt4projectmanager/qtmodulesinfo.h +++ b/src/plugins/qt4projectmanager/qtmodulesinfo.h @@ -32,7 +32,7 @@ #ifndef QTMODULESINFO_H #define QTMODULESINFO_H -#include <QtCore/QStringList> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp index b47bb1fee2..9cb6f5f541 100644 --- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp +++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp @@ -45,9 +45,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/toolchain.h> -#include <QtGui/QLabel> -#include <QtGui/QVBoxLayout> -#include <QtGui/QPushButton> +#include <QLabel> +#include <QVBoxLayout> +#include <QPushButton> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h index cef4cbdd3e..dc51400ee1 100644 --- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h +++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h @@ -35,7 +35,7 @@ #include <projectexplorer/iprojectproperties.h> -#include <QtCore/QString> +#include <QString> namespace Qt4ProjectManager { class TargetSetupPage; diff --git a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp index 44d6bb5f52..68d1d69fa6 100644 --- a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp +++ b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp @@ -40,11 +40,11 @@ #include <qtsupport/qtversionmanager.h> #include <qt4projectmanager/qt4projectmanager.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> -#include <QtGui/QCheckBox> +#include <QCoreApplication> +#include <QIcon> +#include <QComboBox> +#include <QLabel> +#include <QCheckBox> #include <QFormLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h index 81e72c245d..d8db4e118a 100644 --- a/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h +++ b/src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.h @@ -34,7 +34,7 @@ #define UNCONFIGUREDSETTINGSOPTIONPAGE_H #include <coreplugin/dialogs/ioptionspage.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/qt4projectmanager/winceqtversion.cpp b/src/plugins/qt4projectmanager/winceqtversion.cpp index f7cb2dd1d7..372e20dd19 100644 --- a/src/plugins/qt4projectmanager/winceqtversion.cpp +++ b/src/plugins/qt4projectmanager/winceqtversion.cpp @@ -33,7 +33,7 @@ #include "winceqtversion.h" #include "qt4projectmanagerconstants.h" #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp b/src/plugins/qt4projectmanager/winceqtversionfactory.cpp index f5bbda0789..b2521bbb26 100644 --- a/src/plugins/qt4projectmanager/winceqtversionfactory.cpp +++ b/src/plugins/qt4projectmanager/winceqtversionfactory.cpp @@ -34,7 +34,7 @@ #include "winceqtversion.h" #include <qtsupport/qtsupportconstants.h> #include <qtsupport/profilereader.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index bb0cf74f54..793af7f9fe 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -32,10 +32,10 @@ #include "abstractmobileapp.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QDir> +#include <QFile> +#include <QTextStream> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h index 587ab95d58..903fd2c174 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h @@ -34,8 +34,8 @@ #define ABSTRACTMOBILEAPP_H #include "../qt4projectmanager_global.h" -#include <QtCore/QFileInfo> -#include <QtCore/QPair> +#include <QFileInfo> +#include <QPair> #ifndef CREATORLESSTEST #include <coreplugin/basefilewizard.h> diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 705672a137..1e3594d90f 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -45,7 +45,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp index 1aa6594760..c02dba5b13 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp @@ -39,12 +39,12 @@ #include <cpptools/abstracteditorsupport.h> #include <qtsupport/qtsupportconstants.h> -#include <QtGui/QIcon> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <QIcon> +#include <QFileInfo> +#include <QTextStream> static const char mainCppC[] = -"#include <QtCore/QCoreApplication>\n\n" +"#include <QCoreApplication>\n\n" "int main(int argc, char *argv[])\n" "{\n" " QCoreApplication a(argc, argv);\n\n" diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp index 9fd53fd073..10b3453729 100644 --- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp @@ -34,7 +34,7 @@ #include "consoleappwizard.h" #include <coreplugin/basefilewizard.h> -#include <QtCore/QDebug> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp index 8e6a175df4..13bc58ac63 100644 --- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp @@ -36,7 +36,7 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp index 38f95e05b7..d2e60bdc3f 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp @@ -34,8 +34,8 @@ #include <utils/newclasswidget.h> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QLabel> +#include <QLayout> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h index 999e3d25e2..ab2eb93e8b 100644 --- a/src/plugins/qt4projectmanager/wizards/filespage.h +++ b/src/plugins/qt4projectmanager/wizards/filespage.h @@ -33,7 +33,7 @@ #ifndef FILESPAGE_H #define FILESPAGE_H -#include <QtGui/QWizard> +#include <QWizard> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index 103c91e11e..b508397f5a 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -44,14 +44,14 @@ #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QTextStream> -#include <QtCore/QUuid> -#include <QtCore/QFileInfo> -#include <QtCore/QSharedPointer> +#include <QDir> +#include <QFile> +#include <QTextStream> +#include <QUuid> +#include <QFileInfo> +#include <QSharedPointer> -#include <QtGui/QIcon> +#include <QIcon> static const char mainSourceFileC[] = "main"; static const char mainSourceShowC[] = " w.show();\n"; diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 740d4f2219..6a72bfe67c 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -37,7 +37,7 @@ #include "qtprojectparameters.h" #include "qt4projectmanagerconstants.h" -#include <QtCore/QSet> +#include <QSet> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp index 643a33aa29..95e798bbb5 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp @@ -32,11 +32,11 @@ #include "html5app.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> +#include <QCoreApplication> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/html5app.h b/src/plugins/qt4projectmanager/wizards/html5app.h index ae758efb1a..0c45d691d1 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.h +++ b/src/plugins/qt4projectmanager/wizards/html5app.h @@ -35,8 +35,8 @@ #include "abstractmobileapp.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp index 096ac39367..4b7d185024 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp @@ -42,8 +42,8 @@ #include <qtsupport/qtsupportconstants.h> #include <limits> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp index c864be9272..411d84976d 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp @@ -34,10 +34,10 @@ #include "ui_html5appwizardsourcespage.h" #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h index fb2b36632c..26cf4cfb4a 100644 --- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h @@ -33,7 +33,7 @@ #ifndef HTML5APPWIZARDPAGES_H #define HTML5APPWIZARDPAGES_H -#include <QtGui/QWizardPage> +#include <QWizardPage> #include "html5app.h" namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp index aae672c9da..8e15586abc 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp @@ -34,8 +34,8 @@ #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QStringList> +#include <QTextStream> +#include <QStringList> // Contents of the header defining the shared library export. #define GUARD_VARIABLE "<GUARD>" diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h index 9188d20a91..cee975f7fc 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h @@ -35,7 +35,7 @@ #include "qtprojectparameters.h" -#include <QtCore/QString> +#include <QString> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp index e879d74c4c..27d98cb6b4 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp @@ -40,10 +40,10 @@ #include <cpptools/abstracteditorsupport.h> #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtGui/QIcon> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QIcon> static const char sharedHeaderPostfixC[] = "_global"; diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp index 755f42eb1e..9dc08805f2 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp @@ -41,11 +41,11 @@ #include <utils/projectintropage.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> +#include <QDebug> +#include <QDir> -#include <QtGui/QComboBox> -#include <QtGui/QLabel> +#include <QComboBox> +#include <QLabel> enum { debugLibWizard = 0 }; diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp index 6e191ac1db..73c7c94de9 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp @@ -34,10 +34,10 @@ #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp index f70fdaa812..a79a53e39a 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp @@ -42,8 +42,8 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp index 06c9c63da3..247fbc220e 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp @@ -38,11 +38,11 @@ #include <coreplugin/coreconstants.h> #include <utils/fileutils.h> -#include <QtCore/QTemporaryFile> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QTemporaryFile> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h index b64b6aa498..433099ab74 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h @@ -35,7 +35,7 @@ #include "abstractmobileapp.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp index 0cb8c843a9..2574a27cb9 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp @@ -33,8 +33,8 @@ #include "mobilelibraryparameters.h" #include "qtprojectparameters.h" -#include <QtCore/QTextStream> -#include <QtCore/QDir> +#include <QTextStream> +#include <QDir> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h index 9195623926..d2fb832a9a 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h +++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h @@ -33,7 +33,7 @@ #ifndef MOBILELIBRARYPARAMETERS_H #define MOBILELIBRARYPARAMETERS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp index 7fa6d782e0..15f40f2241 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp @@ -36,9 +36,9 @@ #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h index 2739f7ca77..456ce2292c 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h +++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h @@ -33,7 +33,7 @@ #ifndef MOBILELIBRARYWIZARDOPTIONPAGE_H #define MOBILELIBRARYWIZARDOPTIONPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp index ffb8a7d3c5..6539cbf04a 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp +++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp @@ -36,13 +36,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QDebug> +#include <QVariant> -#include <QtGui/QCheckBox> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QWidget> +#include <QCheckBox> +#include <QLabel> +#include <QLayout> +#include <QWidget> #include <math.h> diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.h b/src/plugins/qt4projectmanager/wizards/modulespage.h index 3654ae6382..4b31480183 100644 --- a/src/plugins/qt4projectmanager/wizards/modulespage.h +++ b/src/plugins/qt4projectmanager/wizards/modulespage.h @@ -33,9 +33,9 @@ #ifndef MODULESPAGE_H #define MODULESPAGE_H -#include <QtCore/QMap> -#include <QtCore/QStringList> -#include <QtGui/QWizard> +#include <QMap> +#include <QStringList> +#include <QWizard> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp index d96b870840..4caa1d029e 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp @@ -33,11 +33,11 @@ #include "qtprojectparameters.h" #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QDir> +#include <QCoreApplication> +#include <QDateTime> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h index 146a53de09..2eccb33516 100644 --- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h +++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h @@ -33,7 +33,7 @@ #ifndef QTPROJECTPARAMETERS_H #define QTPROJECTPARAMETERS_H -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index 4d1e3d3313..8f022de526 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -32,11 +32,11 @@ #include "qtquickapp.h" -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QTextStream> +#include <QCoreApplication> #ifndef CREATORLESSTEST #include <coreplugin/icore.h> diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h index 82e5d93f5d..ed124cf2a4 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h @@ -35,8 +35,8 @@ #include "abstractmobileapp.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp index 7f3959d2e2..48fca50381 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp @@ -42,9 +42,9 @@ #include <projectexplorer/projectexplorerconstants.h> #include <coreplugin/dialogs/iwizard.h> -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QIcon> +#include <QDebug> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp index ee2de0f1bc..15f3333be6 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp @@ -34,10 +34,10 @@ #include "ui_qtquickcomponentsetoptionspage.h" #include <coreplugin/coreconstants.h> -#include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDesktopServices> +#include <QFileDialog> +#include <QFileDialog> +#include <QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h index d1c2cead9c..fda053b2ff 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h +++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h @@ -35,7 +35,7 @@ #include "qtquickapp.h" -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp index 08536dbdd3..bfe642b2f6 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp @@ -49,8 +49,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QVariant> +#include <QCoreApplication> +#include <QVariant> using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h index a823e870e1..ababad4175 100644 --- a/src/plugins/qt4projectmanager/wizards/qtwizard.h +++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h @@ -39,7 +39,7 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QSet> +#include <QSet> namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp index 2b4e9a86e9..0c58f4a45b 100644 --- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp @@ -37,7 +37,7 @@ #include <projectexplorer/projectexplorerconstants.h> #include <coreplugin/icore.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp index 85f33f14aa..76858f05d3 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp @@ -49,8 +49,8 @@ #include <utils/qtcassert.h> #include <utils/qtcprocess.h> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QLabel> +#include <QLayout> using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h index 396b70dbe5..0c32e5ebad 100644 --- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h +++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.h @@ -38,8 +38,8 @@ #include <qtsupport/qtversionmanager.h> #include <coreplugin/featureprovider.h> -#include <QtCore/QString> -#include <QtGui/QWizard> +#include <QString> +#include <QWizard> QT_BEGIN_NAMESPACE diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp index 012fcb9ff3..decd84fd45 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp @@ -39,10 +39,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> +#include <QTextStream> +#include <QFileInfo> -#include <QtGui/QIcon> +#include <QIcon> namespace Qt4ProjectManager { namespace Internal { @@ -98,9 +98,9 @@ static QString generateTestCode(const TestWizardParameters &testParams, QTextStream str(&rc); // Includes str << CppTools::AbstractEditorSupport::licenseTemplate(testParams.fileName, testParams.className) - << "#include <QtCore/QString>\n#include <QtTest/QtTest>\n"; + << "#include <QString>\n#include <QtTest>\n"; if (testParams.requiresQApplication) - str << "#include <QtCore/QCoreApplication>\n"; + str << "#include <QCoreApplication>\n"; // Class declaration str << "\nclass " << testParams.className << " : public QObject\n" "{\n" << indent << "Q_OBJECT\n\npublic:\n" diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp index ca8b2f1712..6b5561a3e8 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp @@ -33,7 +33,7 @@ #include "testwizarddialog.h" #include "testwizardpage.h" -#include <QtCore/QFileInfo> +#include <QFileInfo> enum PageIds { StartPageId = 0 }; diff --git a/src/plugins/qt4projectmanager/wizards/testwizardpage.h b/src/plugins/qt4projectmanager/wizards/testwizardpage.h index c51f8b3c2d..9cf9b775e4 100644 --- a/src/plugins/qt4projectmanager/wizards/testwizardpage.h +++ b/src/plugins/qt4projectmanager/wizards/testwizardpage.h @@ -33,7 +33,7 @@ #ifndef TESTWIZARDPAGE_H #define TESTWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Qt4ProjectManager { namespace Internal { |