diff options
20 files changed, 0 insertions, 66 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index fb80a4d4fb..741227c03a 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 c91bfc508a..a24e8190bf 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 b7060d92d5..56d062a46c 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -127,7 +127,6 @@ void ClangParser::stdError(const QString &line) # include <QTest> # 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 db68e85dec..d6f96f47de 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 <QTest> # 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 fb59feeb4d..5648cbe15c 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 5ec7faa904..e1d2e21b33 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 <QTest> # 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 19da83ef79..271d65df64 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 bd668e8766..92bcbb0f16 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 3be5b9907e..40237682ae 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 d4bb307064..c9b2750630 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -128,7 +128,6 @@ void LinuxIccParser::doFlush() #ifdef WITH_TESTS # include <QTest> # 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 61b7b59b40..0000000000 --- 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 <QMetaType> - -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<ProjectExplorer::Project*>) -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 630767669b..f071da6bb3 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 4715c6453b..9f0103eae2 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 586d0cc1ae..3db58c2586 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 3891598c84..19e294b959 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 16762d95d9..c5b6e2f82f 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 c662428651..b3498b0a29 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 0b29101654..592bef9cab 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<ProjectExplorer::Task>) diff --git a/src/plugins/projectexplorer/xcodebuildparser.cpp b/src/plugins/projectexplorer/xcodebuildparser.cpp index 8a2578b671..41f24e0a38 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 058f5c4c14..a1642222f1 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 <projectexplorer/projectexplorerconstants.h> -# include <projectexplorer/metatypedeclarations.h> # include <projectexplorer/outputparser_test.h> using namespace ProjectExplorer; |