diff options
| author | Tatiana Borisova <[email protected]> | 2024-09-03 14:26:28 +0200 |
|---|---|---|
| committer | Tatiana Borisova <[email protected]> | 2024-09-08 10:20:22 +0200 |
| commit | f6dab97455f866243132ed38a070ebb3879a0c82 (patch) | |
| tree | 071b6df74e338d7618c620f0d18b2c8954dd5742 /src/tools/androiddeployqt/main.cpp | |
| parent | 5a28fe86af30bd3293f49ad09ee9c044e06ccbe3 (diff) | |
qtbase build should't fail with -DFEATURE_process=OFF option
- Added #if QT_CONFIG(process) to the qt code that uses a QProcess
Pick-to: 6.8
Change-Id: I79b39392bd2f75384256e5564203a8c875169916
Reviewed-by: Assam Boudjelthia <[email protected]>
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index e90d2d1ed64..e808330a0cd 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -20,7 +20,9 @@ #include <QHash> #include <QSet> #include <QMap> +#if QT_CONFIG(process) #include <QProcess> +#endif #include <depfile_shared.h> #include <shellquote_shared.h> @@ -3493,6 +3495,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)); @@ -3512,6 +3515,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 { |