Merge remote-tracking branch 'origin/8.0'

Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
2022-06-28 11:35:16 +02:00
parent 9e363c6421 ebf57d37b9
commit f95a1eca34
134 changed files with 595 additions and 520 deletions
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -79,7 +79,6 @@ private:

    bool init() final;
    void setupOutputFormatter(Utils::OutputFormatter *formatter) final;
-    void doRun() final;
    bool fromMap(const QVariantMap &map) final;
    QVariantMap toMap() const final;

@@ -249,11 +248,6 @@ FilePath IosBuildStep::buildCommand() const
    return "xcodebuild"; // add path?
 }

-void IosBuildStep::doRun()
-{
-    AbstractProcessStep::doRun();
-}
-
 void IosBuildStep::setBaseArguments(const QStringList &args)
 {
    m_baseBuildArguments = args;