From 10680554db85ba3c5290e9c7dee3cc20c45b0414 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Tue, 3 Sep 2024 14:26:28 +0200 Subject: [PATCH] qtbase build should't fail with -DFEATURE_process=OFF option - Added #if QT_CONFIG(process) to the qt code that uses a QProcess Change-Id: I79b39392bd2f75384256e5564203a8c875169916 Reviewed-by: Assam Boudjelthia (cherry picked from commit f6dab97455f866243132ed38a070ebb3879a0c82) Reviewed-by: Qt Cherry-pick Bot --- src/tools/androiddeployqt/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index f1ddf254373..f2d3e5bf1de 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -20,7 +20,9 @@ #include #include #include +#if QT_CONFIG(process) #include +#endif #include #include @@ -3483,6 +3485,7 @@ int generateJavaQmlComponents(const Options &options) const QString qmlDomCmd = "%1 -d -D required -f +:propertyInfos %2 %3"_L1.arg( shellQuote(qmlDomExecPath), importFlags, shellQuote("%1/%2"_L1.arg(qmldirPath, qmlFile))); +#if QT_CONFIG(process) const QStringList qmlDomCmdParts = QProcess::splitCommand(qmlDomCmd); QProcess process; process.start(qmlDomCmdParts.first(), qmlDomCmdParts.sliced(1)); @@ -3502,6 +3505,10 @@ int generateJavaQmlComponents(const Options &options) if (jsonError.error != QJsonParseError::NoError) fprintf(stderr, "Output of %s is not valid JSON document.", qPrintable(qmlDomCmd)); return jsonDoc.object(); +#else +#warning Generating QtQuickView Java Contents is not possible with missing QProcess feature. + return QJsonObject(); +#endif }; const auto getComponent = [](const QJsonObject &dom) -> QJsonObject {