diff options
author | Robert Griebl <robert.griebl@qt.io> | 2023-05-15 12:41:22 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2023-05-25 12:43:33 +0000 |
commit | 76726d2d6b656274bde883b6de59de95beb5c602 (patch) | |
tree | 67ba779853dee4be5036f0ac5c12ee7373481be7 | |
parent | 2806be30c5cc215ebdc26f3bc50cd504609f5940 (diff) |
Revert "Unbreak the submodule integration"
Now that qtbase is fixed, we can go back to our original codebase.
This reverts commit 20303e9fe0a72bb270b2f0a4f75b9132edb2d515.
Change-Id: I87d05e235f88a1a269c8edb7bf8207fb90e86bf0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | src/tools/controller/controller.cpp | 93 |
1 files changed, 41 insertions, 52 deletions
diff --git a/src/tools/controller/controller.cpp b/src/tools/controller/controller.cpp index b553c62b..35123386 100644 --- a/src/tools/controller/controller.cpp +++ b/src/tools/controller/controller.cpp @@ -359,13 +359,12 @@ int main(int argc, char *argv[]) stdRedirections[qSL("err")] = 2; bool restart = clp.isSet(qSL("restart")); - a.runLater([=, &clp]() { - startOrDebugApplication(QString(), - clp.positionalArguments().at(1), - stdRedirections, - restart, - args == 3 ? clp.positionalArguments().at(2) : QString()); - }); + a.runLater(std::bind(startOrDebugApplication, + QString(), + clp.positionalArguments().at(1), + stdRedirections, + restart, + args == 3 ? clp.positionalArguments().at(2) : QString())); break; } case DebugApplication: { @@ -391,13 +390,12 @@ int main(int argc, char *argv[]) stdRedirections[qSL("err")] = 2; bool restart = clp.isSet(qSL("restart")); - a.runLater([=, &clp]() { - startOrDebugApplication(clp.positionalArguments().at(1), - clp.positionalArguments().at(2), - stdRedirections, - restart, - args == 3 ? clp.positionalArguments().at(2) : QString()); - }); + a.runLater(std::bind(startOrDebugApplication, + clp.positionalArguments().at(1), + clp.positionalArguments().at(2), + stdRedirections, + restart, + args == 3 ? clp.positionalArguments().at(2) : QString())); break; } case StopAllApplications: @@ -405,7 +403,7 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() != 1) clp.showHelp(1); - a.runLater([=]() { stopAllApplications(); }); + a.runLater(stopAllApplications); break; case StopApplication: @@ -416,15 +414,14 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() != 2) clp.showHelp(1); - a.runLater([=, &clp]() { - stopApplication(clp.positionalArguments().at(1), - clp.isSet(qSL("f"))); - }); + a.runLater(std::bind(stopApplication, + clp.positionalArguments().at(1), + clp.isSet(qSL("f")))); break; case ListApplications: clp.process(a); - a.runLater([=]() { listApplications(); }); + a.runLater(listApplications); break; case ShowApplication: @@ -435,15 +432,14 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() != 2) clp.showHelp(1); - a.runLater([=, &clp]() { - showApplication(clp.positionalArguments().at(1), - clp.isSet(qSL("json"))); - }); + a.runLater(std::bind(showApplication, + clp.positionalArguments().at(1), + clp.isSet(qSL("json")))); break; case ListPackages: clp.process(a); - a.runLater([=]() { listPackages(); }); + a.runLater(listPackages); break; case ShowPackage: @@ -454,10 +450,9 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() != 2) clp.showHelp(1); - a.runLater([=, &clp]() { - showPackage(clp.positionalArguments().at(1), - clp.isSet(qSL("json"))); - }); + a.runLater(std::bind(showPackage, + clp.positionalArguments().at(1), + clp.isSet(qSL("json")))); break; case InstallPackage: @@ -471,10 +466,9 @@ int main(int argc, char *argv[]) if (clp.isSet(qSL("l"))) fprintf(stderr, "Ignoring the deprecated -l option.\n"); - a.runLater([=, &clp]() { - installPackage(clp.positionalArguments().at(1), - clp.isSet(qSL("a"))); - }); + a.runLater(std::bind(installPackage, + clp.positionalArguments().at(1), + clp.isSet(qSL("a")))); break; case RemovePackage: @@ -486,16 +480,15 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() != 2) clp.showHelp(1); - a.runLater([=, &clp]() { - removePackage(clp.positionalArguments().at(1), - clp.isSet(qSL("k")), - clp.isSet(qSL("f"))); - }); + a.runLater(std::bind(removePackage, + clp.positionalArguments().at(1), + clp.isSet(qSL("k")), + clp.isSet(qSL("f")))); break; case ListInstallationTasks: clp.process(a); - a.runLater([=]() { listInstallationTasks(); }); + a.runLater(listInstallationTasks); break; case CancelInstallationTask: { @@ -508,15 +501,14 @@ int main(int argc, char *argv[]) if (!(((args == 1) && all) || ((args == 2) && !all))) clp.showHelp(1); - a.runLater([=, &clp]() { - cancelInstallationTask(all, - args == 2 ? clp.positionalArguments().at(1) : QString()); - }); + a.runLater(std::bind(cancelInstallationTask, + all, + args == 2 ? clp.positionalArguments().at(1) : QString())); break; } case ListInstallationLocations: clp.process(a); - a.runLater([=]() { listInstallationLocations(); }); + a.runLater(listInstallationLocations); break; case ShowInstallationLocation: @@ -529,14 +521,13 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() == 2) fprintf(stderr, "Ignoring the deprecated installation-location.\n"); - a.runLater([=, &clp]() { - showInstallationLocation(clp.isSet(qSL("json"))); - }); + a.runLater(std::bind(showInstallationLocation, + clp.isSet(qSL("json")))); break; case ListInstances: clp.process(a); - a.runLater([=]() { listInstances(); }); + a.runLater(listInstances); break; case InjectIntentRequest: @@ -561,10 +552,8 @@ int main(int argc, char *argv[]) if (clp.positionalArguments().size() == 3) jsonParams = clp.positionalArguments().at(2); - a.runLater([=, &clp]() { - injectIntentRequest(clp.positionalArguments().at(1), - isBroadcast, requestingAppId, appId, jsonParams); - }); + a.runLater(std::bind(injectIntentRequest, clp.positionalArguments().at(1), + isBroadcast, requestingAppId, appId, jsonParams)); break; } |