Changed return type of :ICore::mainWindow() to QWidget*

Also removed all <QMainWindow> includes which are not needed anymore. Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4 Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:31:22 +04:00
parent a4fcd8d3cb
commit d18bf468ad
72 changed files with 5 additions and 76 deletions
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -52,7 +52,6 @@

 #include <QApplication>
 #include <QDesktopServices>
-#include <QMainWindow>
 #include <QMessageBox>

 #ifdef ENABLE_QT_BREAKPAD
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -90,7 +90,6 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QDialogButtonBox>
-#include <QMainWindow>
 #include <QPushButton>

 using namespace Core;
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -47,7 +47,6 @@

 #include <QtPlugin>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QApplication>

 using namespace Analyzer;
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -44,7 +44,6 @@

 #include <QMenu>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QHBoxLayout>
 #include <QLineEdit>
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -63,7 +63,6 @@
 #include <QDateTime>
 #include <QProcess>
 #include <QFormLayout>
-#include <QMainWindow>
 #include <QInputDialog>
 #include <QFileSystemWatcher>

--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -39,7 +39,6 @@

 #include <QAction>
 #include <QShortcut>
-#include <QMainWindow>

 /*!
    \class Core::Command
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -54,7 +54,6 @@

 #include <QMessageBox>
 #include <QWizard>
-#include <QMainWindow>
 #include <QIcon>

 enum { debugWizard = 0 };
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -78,7 +78,6 @@
 #include <QApplication>
 #include <QFileDialog>
 #include <QLayout>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -38,7 +38,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>

-#include <QMainWindow>
 #include <QMessageBox>

 #include <QCoreApplication>
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -513,7 +513,7 @@ IContext *ICore::currentContextObject()
 }


-QMainWindow *ICore::mainWindow()
+QWidget *ICore::mainWindow()
 {
    return m_mainwindow;
 }
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -37,9 +37,9 @@
 #include <QSettings>

 QT_BEGIN_NAMESPACE
-class QMainWindow;
 class QPrinter;
 class QStatusBar;
+class QWidget;
 template <class T> class QList;
 QT_END_NAMESPACE

@@ -112,7 +112,7 @@ public:
    static QString resourcePath();
    static QString userResourcePath();

-    static QMainWindow *mainWindow();
+    static QWidget *mainWindow();
    static QStatusBar *statusBar();

    static IContext *currentContextObject();
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -47,7 +47,6 @@
 #include <QDockWidget>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMainWindow>
 #include <QMenuBar>
 #include <QPainter>
 #include <QPixmap>
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -64,7 +64,6 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QMenu>
-#include <QMainWindow>
 #include <QInputDialog>
 #include <QUrl>

--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -48,7 +48,6 @@

 #include <QMessageBox>
 #include <QApplication>
-#include <QMainWindow>
 #include <QPushButton>

 namespace CodePaster {
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -112,7 +112,6 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
-#include <QMainWindow>

 #include <sstream>

--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -56,7 +56,6 @@
 #include <QStyle>
 #include <QIcon>
 #include <QApplication>
-#include <QMainWindow>
 #include <QMoveEvent>
 #include <QDesktopWidget>
 #include <QScrollBar>
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -95,7 +95,6 @@
 #include <QAction>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>

--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -47,7 +47,6 @@
 #include <extensionsystem/invoker.h>

 #include <QMessageBox>
-#include <QMainWindow>
 #include <QVBoxLayout>

 #include <cstring>
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -44,7 +44,6 @@
 #include <cppeditor/cppeditorconstants.h>

 #include <QTimer>
-#include <QMainWindow>

 namespace Debugger {
 namespace Internal {
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -76,7 +76,6 @@

 #include <QAction>
 #include <QApplication>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QToolTip>
--- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
+++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
@@ -43,7 +43,6 @@
 #include <QVBoxLayout>
 #include <QFormLayout>
 #include <QMessageBox>
-#include <QMainWindow>

 namespace Debugger {
 namespace Internal {
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -85,7 +85,6 @@
 #include <QCursor>
 #include <QDockWidget>
 #include <QMenu>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QKeySequence>
 #include <QPrintDialog>
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -44,7 +44,6 @@
 #endif

 #include <QMessageBox>
-#include <QMainWindow>
 #include <QUndoStack>

 #include <QFile>
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -34,7 +34,6 @@
 #include <coreplugin/icore.h>

 #include <QSettings>
-#include <QMainWindow>
 #include <QStringListModel>
 #include <QCompleter>
 #include <QKeyEvent>
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -54,7 +54,6 @@
 #include <QDir>
 #include <QProcessEnvironment>

-#include <QMainWindow>
 #include <QComboBox>

 using namespace GenericProjectManager;
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -54,7 +54,6 @@
 #include <QDebug>

 #include <QTreeView>
-#include <QMainWindow>

 using namespace GenericProjectManager;
 using namespace GenericProjectManager::Internal;
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -59,7 +59,6 @@
 #include <QDebug>
 #include <QProcess>
 #include <QRegExp>
-#include <QMainWindow>
 #include <QAction>
 #include <QFileDialog>
 #include <QTemporaryFile>
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -71,7 +71,6 @@
 #include <QSignalMapper>

 #include <QComboBox>
-#include <QMainWindow> // for msg box parent
 #include <QMessageBox>
 #include <QToolButton>
 #include <QTextCodec>
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -79,7 +79,6 @@

 #include <QAction>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>

--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -72,7 +72,6 @@
 #include <QComboBox>
 #include <QHeaderView>
 #include <QInputDialog>
-#include <QMainWindow>
 #include <QToolBar>
 #include <QTreeView>

--- a/src/plugins/glsleditor/glsleditoractionhandler.cpp
+++ b/src/plugins/glsleditor/glsleditoractionhandler.cpp
@@ -37,7 +37,6 @@

 #include <QDebug>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>

 namespace GLSLEditor {
--- a/src/plugins/glsleditor/glsleditorfactory.cpp
+++ b/src/plugins/glsleditor/glsleditorfactory.cpp
@@ -47,7 +47,6 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QMainWindow>

 using namespace GLSLEditor::Internal;
 using namespace GLSLEditor::Constants;
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -43,7 +43,6 @@

 #include <QApplication>
 #include <QDesktopServices>
-#include <QMainWindow>
 #include <QMouseEvent>

 #include <QHelpEngine>
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -59,7 +59,6 @@
 #include <QList>

 #include <QShortcut>
-#include <QMainWindow>
 #include <QAction>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -228,7 +227,7 @@ bool MacroManager::MacroManagerPrivate::executeMacro(Macro *macro)

 void MacroManager::MacroManagerPrivate::showSaveDialog()
 {
-    QMainWindow *mainWindow = Core::ICore::mainWindow();
+    QWidget *mainWindow = Core::ICore::mainWindow();
    SaveDialog dialog(mainWindow);
    if (dialog.exec()) {
        if (dialog.name().isEmpty())
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -63,7 +63,6 @@
 #include <QtPlugin>
 #include <QAction>
 #include <QMenu>
-#include <QMainWindow>
 #include <QtDebug>
 #include <QtGlobal>
 #include <QDir>
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -59,7 +59,6 @@
 #include <utils/QtConcurrentTools>

 #include <QApplication>
-#include <QMainWindow>

 static inline QString msgProgress(int progress, int total)
 {
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -50,7 +50,6 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QGraphicsOpacityEffect>

 using namespace ProjectExplorer;
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -40,7 +40,6 @@
 #include <QFileInfo>
 #include <QHash>
 #include <QList>
-#include <QMainWindow>
 #include <QSettings>
 #include <QString>
 #include <QVariantHash>
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -58,7 +58,6 @@
 #include <QPainter>
 #include <QAction>
 #include <QItemDelegate>
-#include <QMainWindow>
 #include <QApplication>

 static QIcon createCenteredIcon(const QIcon &icon, const QIcon &overlay)
--- a/src/plugins/projectexplorer/pluginfilefactory.cpp
+++ b/src/plugins/projectexplorer/pluginfilefactory.cpp
@@ -43,7 +43,6 @@

 #include <QDebug>
 #include <QMessageBox>
-#include <QMainWindow>

 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
--- a/src/plugins/projectexplorer/profilemanager.cpp
+++ b/src/plugins/projectexplorer/profilemanager.cpp
@@ -49,7 +49,6 @@

 #include <QFormLayout>
 #include <QLabel>
-#include <QMainWindow>

 static const char PROFILE_DATA_KEY[] = "Profile.";
 static const char PROFILE_COUNT_KEY[] = "Profile.Count";
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -130,7 +130,6 @@
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QWizard>

 /*!
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -47,7 +47,6 @@

 #include <QTimer>
 #include <QSettings>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>

--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -59,7 +59,6 @@
 #include <QTimer>

 #include <QApplication>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTextCodec>
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -50,7 +50,6 @@
 #include <QApplication>
 #include <QDebug>
 #include <QFile>
-#include <QMainWindow>
 #include <QMessageBox>

 namespace ProjectExplorer {
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -43,7 +43,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QSettings>
-#include <QMainWindow>

 static const char TOOLCHAIN_DATA_KEY[] = "ToolChain.";
 static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count";
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -45,7 +45,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
-#include <QMainWindow>
 #include <QMessageBox>

 using namespace QmlJS::AST;
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -85,7 +85,6 @@
 #include <QComboBox>
 #include <QHeaderView>
 #include <QInputDialog>
-#include <QMainWindow>
 #include <QToolBar>
 #include <QTreeView>

--- a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
+++ b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
@@ -37,7 +37,6 @@

 #include <QDebug>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>

 namespace QmlJSEditor {
--- a/src/plugins/qmljseditor/qmljseditorfactory.cpp
+++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp
@@ -50,7 +50,6 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QMainWindow>

 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -52,7 +52,6 @@
 #include <QTimer>

 #include <QMessageBox>
-#include <QMainWindow>

 #include <QTcpSocket>

--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -50,7 +50,6 @@
 #include <utils/qtcassert.h>

 #include <QMessageBox>
-#include <QMainWindow>

 #include <QTimer>
 #include <QDateTime>
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -56,8 +56,6 @@
 #include <debugger/debuggerconstants.h>
 #include <utils/qtcassert.h>

-#include <QMainWindow>
-
 #include <QDir>

 namespace Qt4ProjectManager {
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -72,7 +72,6 @@
 #include <QXmlStreamReader>

 #include <QPainter>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 #include <utils/QtConcurrentTools>
--- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
+++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
@@ -46,7 +46,6 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QMainWindow>
 #include <QVBoxLayout>

 #include <QDir>
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -67,7 +67,6 @@
 #include <QPushButton>
 #include <QMessageBox>
 #include <QApplication>
-#include <QMainWindow>
 #include <QDeclarativeImageProvider>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -55,7 +55,6 @@
 #include <QToolTip>
 #include <QMessageBox>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QTextBrowser>
 #include <QDesktopServices>

--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -58,7 +58,6 @@
 #include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QMainWindow>
 #include <QSettings>
 #include <QTextStream>
 #include <QTimer>
--- a/src/plugins/remotelinux/deploymentsettingsassistant.cpp
+++ b/src/plugins/remotelinux/deploymentsettingsassistant.cpp
@@ -45,7 +45,6 @@
 #include <QDir>
 #include <QHash>
 #include <QString>
-#include <QMainWindow>

 using namespace Qt4ProjectManager;

--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -36,7 +36,6 @@

 #include <QTimer>
 #include <QFileDialog>
-#include <QMainWindow>

 namespace RemoteLinux {
 namespace Internal {
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -49,7 +49,6 @@
 #include <QDir>
 #include <qdebug.h>
 #include <QHBoxLayout>
-#include <QMainWindow>
 #include <QMenu>
 #include <QToolBar>
 #include <QInputDialog>
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -73,7 +73,6 @@
 #include <QXmlStreamReader>
 #include <QAction>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 #include <QInputDialog>
--- a/src/plugins/tasklist/taskfilefactory.cpp
+++ b/src/plugins/tasklist/taskfilefactory.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/id.h>
 #include <coreplugin/documentmanager.h>

-#include <QMainWindow>
 #include <QMessageBox>

 using namespace TaskList::Internal;
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -56,7 +56,6 @@
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMainWindow>
 #include <QPushButton>
 #include <QTextBlock>

--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -46,7 +46,6 @@
 #include <QTextStream>
 #include <QTextCodec>
 #include <QFutureInterface>
-#include <QMainWindow>
 #include <QSyntaxHighlighter>
 #include <QApplication>

--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -40,7 +40,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFont>
-#include <QMainWindow>
 #include <QSettings>
 #include <QTextCharFormat>

--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -49,7 +49,6 @@
 #include <QInputDialog>
 #include <QListWidget>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QPalette>
 #include <QTextCharFormat>
 #include <QTextEdit>
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -39,7 +39,6 @@

 #include <QFile>
 #include <QSet>
-#include <QMainWindow>
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTextDocument>
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -49,7 +49,6 @@
 #include <QTextStream>
 #include <QHash>
 #include <QMessageBox>
-#include <QMainWindow>

 namespace TextEditor {
 namespace Internal {
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -61,7 +61,6 @@
 #include <utils/qtcassert.h>

 #include <QtPlugin>
-#include <QMainWindow>
 #include <QShortcut>
 #include <QDir>
 #include <QTemporaryFile>
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -60,7 +60,6 @@
 #include <QAction>
 #include <QMessageBox>
 #include <QFileDialog>
-#include <QMainWindow>

 using namespace Utils;

@@ -643,7 +642,7 @@ void VcsBasePlugin::createRepository()
    if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectExplorerPlugin::currentProject())
        directory = QFileInfo(currentProject->document()->fileName()).absolutePath();
    // Prompt for a directory that is not under version control yet
-    QMainWindow *mw = Core::ICore::mainWindow();
+    QWidget *mw = Core::ICore::mainWindow();
    do {
        directory = QFileDialog::getExistingDirectory(mw, tr("Choose Repository Directory"), directory);
        if (directory.isEmpty())
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -78,7 +78,6 @@
 #include <QAction>
 #include <QApplication>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QCompleter>
 #include <QLineEdit>
 #include <QTextEdit>