Remove apparently unneeded QtPlugin includes

Change-Id: I511c0318a72dbf2a92e4749dee02eabfc9826139 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-12 13:41:34 +01:00
parent bdeedf8805
commit 299d34d547
23 changed files with 5 additions and 24 deletions
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -28,7 +28,6 @@
 #include "extensionsystem_global.h"

 #include <QObject>
-#include <QtPlugin>

 namespace ExtensionSystem {

--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -59,6 +59,7 @@
 #include <QDomDocument>
 #include <QFileSystemWatcher>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMessageBox>
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -72,7 +72,6 @@
 #include <QMainWindow>
 #include <QMenu>
 #include <QTextCursor>
-#include <QtPlugin>

 #ifdef WITH_TESTS
 #include "autotestunittests.h"
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -66,8 +66,6 @@
 #include <QMessageBox>
 #include <QMenu>

-#include <QtPlugin>
-
 using namespace ProjectExplorer;

 namespace ClangFormat {
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -58,11 +58,10 @@
 #include <utils/theme/theme.h>
 #include <utils/theme/theme_p.h>

-#include <QtPlugin>
-
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
+#include <QJsonObject>
 #include <QMenu>
 #include <QMessageBox>
 #include <QSettings>
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -50,8 +50,6 @@
 #include <QStringListModel>
 #include <QVector>
 #include <QAction>
-
-#include <QtPlugin>
 #include <QSettings>

 /*!
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -58,7 +58,6 @@

 #include <QAction>
 #include <QSettings>
-#include <QtPlugin>

 #ifdef Q_OS_MACOS
 #include "spotlightlocatorfilter.h"
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -67,7 +67,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTextCodec>
-#include <QtPlugin>
 #include <QAction>
 #include <QMainWindow>
 #include <QMenu>
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -148,7 +148,6 @@
 #include <QVariant>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QtPlugin>

 #ifdef WITH_TESTS

--- a/src/plugins/emacskeys/emacskeysplugin.cpp
+++ b/src/plugins/emacskeys/emacskeysplugin.cpp
@@ -43,8 +43,6 @@
 #include <QClipboard>
 #include <QScrollBar>

-#include <QtPlugin>
-
 QT_BEGIN_NAMESPACE
 extern void qt_set_sequence_auto_mnemonic(bool enable);
 QT_END_NAMESPACE
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -36,6 +36,7 @@

 #include <QFile>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QMessageBox>
 #include <QRegularExpression>
 #include <QSettings>
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -34,7 +34,6 @@
 #include <coreplugin/id.h>

 #include <QDebug>
-#include <QtPlugin>
 #include <QAction>
 #include <QMenu>
 #include <QMessageBox>
--- a/src/plugins/marketplace/productlistmodel.cpp
+++ b/src/plugins/marketplace/productlistmodel.cpp
@@ -34,6 +34,7 @@

 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -56,7 +56,6 @@
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcscommand.h>

-#include <QtPlugin>
 #include <QAction>
 #include <QMenu>
 #include <QDebug>
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -68,7 +68,6 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QTextCodec>
-#include <QtPlugin>

 using namespace Core;
 using namespace Utils;
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -50,6 +50,7 @@
 #include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QProcess>
 #include <QRegularExpression>
 #include <QSettings>
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -145,7 +145,6 @@
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>

-#include <QtPlugin>
 #include <QFileInfo>
 #include <QSettings>

--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
@@ -32,8 +32,6 @@
 #include <viewmanager.h>
 #include <qmldesignerplugin.h>

-#include <QtPlugin>
-
 namespace QmlDesigner {

 ComponentsPlugin::ComponentsPlugin()
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -24,7 +24,6 @@
 ****************************************************************************/

 #include "qtquickplugin.h"
-#include <QtPlugin>

 namespace QmlDesigner {

--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -48,7 +48,6 @@
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>

-#include <QtPlugin>
 #include <QCoreApplication>
 #include <QAction>
 #include <QDebug>
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -65,7 +65,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTextCodec>
-#include <QtPlugin>
 #include <QProcessEnvironment>
 #include <QUrl>
 #include <QXmlStreamReader>
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -52,7 +52,6 @@
 #include <utils/qtcassert.h>
 #include <utils/macroexpander.h>

-#include <QtPlugin>
 #include <QAction>
 #include <QDir>

--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -46,7 +46,6 @@
 #include <QPointer>
 #include <QProcessEnvironment>
 #include <QTimer>
-#include <QtPlugin>

 namespace {
    static const char UpdaterGroup[] = "Updater";