diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index fb80a4d4fb40d6020471478e78fb77beaa415a5d..741227c03a2805dde41cf2cd9e7e20a607b50152 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -153,4 +153,3 @@ signals: } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *) diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index c91bfc508ae65ceadd2343146a400f906a59d2e1..a24e8190bf8224d59dca22e1c381018d6646e60b 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -79,4 +79,3 @@ private: } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *) diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp index b7060d92d57d61b57954ba227b2f1f8c2653ea5f..56d062a46c41477d79efcced2cb1df391ce719ff 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -127,7 +127,6 @@ void ClangParser::stdError(const QString &line) # include # include "projectexplorer.h" -# include "metatypedeclarations.h" # include "outputparser_test.h" void ProjectExplorerPlugin::testClangOutputParser_data() diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index db68e85dec83739db3db2eb31fd078ecf2246099..d6f96f47dece0ebbf811b69f2f3566a205ae79e6 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -178,7 +178,6 @@ bool CustomParser::parseLine(const QString &rawLine, CustomParserExpression::Cus # include # include "projectexplorer.h" -# include "metatypedeclarations.h" # include "outputparser_test.h" void ProjectExplorerPlugin::testCustomOutputParsers_data() diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index fb59feeb4d0e846f9441b27a40b2758502b213c5..5648cbe15ca3ec48e98a8454ce8862fc4a3cb249 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -131,4 +131,3 @@ private: } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *) diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 5ec7faa9045b6fe663a2fd9473e2c33f786f7b6e..e1d2e21b33671db16140c6afd41f3a088e87119d 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -186,7 +186,6 @@ void GccParser::amendDescription(const QString &desc, bool monospaced) # include # include "projectexplorer.h" -# include "metatypedeclarations.h" # include "outputparser_test.h" void ProjectExplorerPlugin::testGccOutputParsers_data() diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index 19da83ef797a542d63329465a2c542afc94fc042..271d65df64ce45ac38461ec2e95fe4dd5a4ca164 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -204,8 +204,6 @@ QStringList GnuMakeParser::searchDirectories() const # include "projectexplorer.h" # include "projectexplorerconstants.h" -# include "metatypedeclarations.h" - GnuMakeParserTester::GnuMakeParserTester(GnuMakeParser *p, QObject *parent) : QObject(parent), parser(p) diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h index bd668e87666c3dac056c3318d3ff80f8fb12734f..92bcbb0f1638de98a637d5b49394f56def6b720d 100644 --- a/src/plugins/projectexplorer/ioutputparser.h +++ b/src/plugins/projectexplorer/ioutputparser.h @@ -75,4 +75,3 @@ private: } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::IOutputParser*) diff --git a/src/plugins/projectexplorer/ipotentialkit.h b/src/plugins/projectexplorer/ipotentialkit.h index 3be5b9907e3db95eb9888a4d3cc1e7136e8fbeb5..40237682aeebd3e515b6eb32fc48f204f7723696 100644 --- a/src/plugins/projectexplorer/ipotentialkit.h +++ b/src/plugins/projectexplorer/ipotentialkit.h @@ -42,4 +42,3 @@ public: }; } -Q_DECLARE_METATYPE(ProjectExplorer::IPotentialKit*) diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index d4bb307064b088987a49cb32882637345e7130bd..c9b2750630a1ddd27d15a4c6bcda74be7173ca88 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -128,7 +128,6 @@ void LinuxIccParser::doFlush() #ifdef WITH_TESTS # include # include "projectexplorer.h" -# include "metatypedeclarations.h" # include "outputparser_test.h" void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h deleted file mode 100644 index 61b7b59b40afb3ff5c25e8863f68973a9d6c575a..0000000000000000000000000000000000000000 --- a/src/plugins/projectexplorer/metatypedeclarations.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -namespace ProjectExplorer { -class IProjectManager; -class SessionManager; -class Project; -} - -// Required for Q_DECLARE_METATYPE of forward-declared types. -Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::Project*) -Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::IProjectManager*) -Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::SessionManager*) - -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(ProjectExplorer::SessionManager*) -Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*) diff --git a/src/plugins/projectexplorer/outputparser_test.h b/src/plugins/projectexplorer/outputparser_test.h index 630767669b1c44419bce7ca780bce49b2636aea0..f071da6bb325f90a1b3daf997cac79ae0c245747 100644 --- a/src/plugins/projectexplorer/outputparser_test.h +++ b/src/plugins/projectexplorer/outputparser_test.h @@ -30,7 +30,6 @@ #include "projectexplorer_export.h" #include "ioutputparser.h" -#include "metatypedeclarations.h" #include "task.h" namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 4715c6453b933997bd7aba4297f6ac76c8100c6a..9f0103eae27ddc5b0621761bb057519d7b331fff 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -82,4 +82,3 @@ PROJECTEXPLORER_EXPORT QString displayNameFromMap(const QVariantMap &map); } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::ProjectConfiguration *) diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 586d0cc1ae0ab173be7197107c6fb2f731c77e34..3db58c2586ce035044ef9c94f2c59bcea7a6b245 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -105,7 +105,6 @@ HEADERS += projectexplorer.h \ abstractprocessstep.h \ taskhub.h \ localapplicationruncontrol.h \ - metatypedeclarations.h \ headerpath.h \ gcctoolchainfactories.h \ appoutputpane.h \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 3891598c84e9de1b21494648a70e768a160afd67..19e294b959b3a9cac2b0301ab08f50a30d7f87fc 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -95,7 +95,6 @@ QtcPlugin { "linuxiccparser.cpp", "linuxiccparser.h", "localapplicationruncontrol.cpp", "localapplicationruncontrol.h", "localenvironmentaspect.cpp", "localenvironmentaspect.h", - "metatypedeclarations.h", "miniprojecttargetselector.cpp", "miniprojecttargetselector.h", "namedwidget.cpp", "namedwidget.h", "nodesvisitor.cpp", "nodesvisitor.h", diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 16762d95d944e017523bc703a9a8655dee5ecf15..c5b6e2f82f29344c451f01d5a0d11cc062eb46e6 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -406,6 +406,3 @@ private: } // namespace ProjectExplorer -// Allow a RunConfiguration to be stored in a QVariant -Q_DECLARE_METATYPE(ProjectExplorer::RunConfiguration*) -Q_DECLARE_METATYPE(ProjectExplorer::RunControl*) diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index c662428651f6d5a5c206d9dc53fdf0b279d86170..b3498b0a299a7c8db97ef917dfc0eca5030f6565 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -175,4 +175,3 @@ private: } // namespace ProjectExplorer -Q_DECLARE_METATYPE(ProjectExplorer::Target *) diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index 0b291016546052e17253a913fccd4eb53ccb1738..592bef9cab748139a089079f89cfe2306a81f418 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -91,4 +91,3 @@ bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b); } //namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::Task) -Q_DECLARE_METATYPE(QList) diff --git a/src/plugins/projectexplorer/xcodebuildparser.cpp b/src/plugins/projectexplorer/xcodebuildparser.cpp index 8a2578b6714b9f1e9b0e919a19861824f2475368..41f24e0a3844898c44e6f6048f8774819e8b02ab 100644 --- a/src/plugins/projectexplorer/xcodebuildparser.cpp +++ b/src/plugins/projectexplorer/xcodebuildparser.cpp @@ -121,8 +121,6 @@ void XcodebuildParser::stdError(const QString &line) # include "outputparser_test.h" # include "projectexplorer.h" -# include "metatypedeclarations.h" - using namespace ProjectExplorer; Q_DECLARE_METATYPE(ProjectExplorer::XcodebuildParser::XcodebuildStatus) diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp index 058f5c4c145d5747e5e6326fd3b27457b63cec74..a1642222f1cf529334e54a9921eacf601c3f23cd 100644 --- a/src/plugins/qtsupport/qtparser.cpp +++ b/src/plugins/qtsupport/qtparser.cpp @@ -85,7 +85,6 @@ void QtParser::stdError(const QString &line) # include "qtsupportplugin.h" # include -# include # include using namespace ProjectExplorer;