From 6d26411500cff41fe32d0d6e322bbf328ba6f029 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 21 Mar 2024 15:21:45 +0200 Subject: [PATCH] Improve ConanfileProbe. Add remote option. --- qbs/imports/conan/ConanfileProbe.qbs | 6 ++++++ valentina.qbs | 2 ++ 2 files changed, 8 insertions(+) diff --git a/qbs/imports/conan/ConanfileProbe.qbs b/qbs/imports/conan/ConanfileProbe.qbs index 1479efe2f..87dc1c999 100644 --- a/qbs/imports/conan/ConanfileProbe.qbs +++ b/qbs/imports/conan/ConanfileProbe.qbs @@ -45,6 +45,7 @@ Probe { property var settings property bool verbose: false property stringList profiles: [] + property string remote // Output property var dependencies @@ -115,6 +116,11 @@ Probe { Utilities.getHash(args.join())); args = args.concat(["-if", generatedFilesPath]); + + if (remote) { + args = args.concat(["--remote", remote]); + } + var p = new Process(); p.start(executable, args); while (!p.waitForFinished(500)) { diff --git a/valentina.qbs b/valentina.qbs index 8bfef2d75..f354e695d 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -10,6 +10,7 @@ Project { property bool enableConan: false property bool conanWithXerces: false property bool conanWithCrashReporting: false + property string conanRemote property string minimumMacosVersion: undefined property string minimumQtVersion: "5.15" property stringList conanProfiles: [] @@ -22,6 +23,7 @@ Project { conanfilePath: project.sourceDirectory + "/conanfile.py" verbose: true profiles: conanProfiles + remote: conanRemote options: { var o = {}; if (conanWithXerces)