Fallback to conan 1.59.

.cirrus.yml

@@ -167,10 +167,10 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p
     - brew update > /dev/null
-    - brew install --force qt6 coreutils ccache conan qbs cmake
+    - brew install --force qt6 coreutils ccache qbs cmake
     - chmod -R 755 /opt/homebrew/opt/qt6/*
     - python3 --version
-    - pip3 install --user --upgrade pip dropbox
+    - pip3 install --user --upgrade pip dropbox conan==1.59
     - ccache --set-config=sloppiness=pch_defines,time_macros 
     - conan --version
     - qmake --version
@@ -178,8 +178,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - qbs --version
   build_script:
     - pwd
-    - conan profile detect
+    - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
-    - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/[~3.2]
     - qbs setup-toolchains --detect
     - qbs config --list profiles
     - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6

appveyor.yml

@@ -329,7 +329,7 @@ for:
     # Install the build dependencies of the project.
     - (python -m pip install --upgrade pip)
     - if "%DEPLOY%" == "true" (python -m pip install dropbox)
-    - python -m pip install conan
+    - python -m pip install conan==1.59
     # Trick qmake to not work through MSYS
     - del /F "C:\Program Files\Git\usr\bin\sh.exe"
     - del /F "C:\Program Files\Git\bin\sh.exe"
@@ -342,53 +342,38 @@ for:
     - qbs-setup-qt %QTDIR%\bin\qmake.exe qt6
     - qbs-config defaultProfile qt6
     - dir "C:\Qt\Tools"
-    - conan config home
+    - conan profile new valentina
-    - type %HOMEPATH%\.conan2\settings.yml
+    - conan profile update settings.build_type=Release valentina
-    - conan profile detect
+    - conan profile update settings.os=Windows valentina
-    - conan profile detect --name valentina
     - ps: |
         if ($env:ARCH -eq "x64") {
-          $arch="arch=x86_64"
+          & conan profile update settings.arch=x86_64 valentina
         } else {
-          $arch="arch=x86"
+          & conan profile update settings.arch=x86 valentina
         }
         if ($env:COMPILER -eq "msvc")
         {
           & qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $env:COMPILER
           & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
-          $profile = @"
+          & conan profile update settings.compiler=msvc valentina
-        [settings]
+          & conan profile update settings.compiler.cppstd=17 valentina
-        build_type=Release
+          & conan profile update settings.compiler.runtime=dynamic valentina
-        compiler=msvc
+          & conan profile update settings.compiler.runtime_type=Release valentina
-        compiler.cppstd=17
+          & conan profile update settings.compiler.version=192 valentina
-        compiler.runtime=dynamic
-        compiler.runtime_type=Release
-        compiler.version=192
-        os=Windows
-        $arch
-        "@
         }
         else
         {
           & qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER
           & qbs-config.exe  profiles.qt6.baseProfile $env:COMPILER
-          $profile = @"
+          & conan profile update settings.compiler=gcc valentina
-        [settings]
+          & conan profile update settings.compiler.cppstd=gnu17 valentina
-        build_type=Release
+          & conan profile update settings.compiler.libcxx=libstdc++11 valentina
-        compiler=gcc
+          & conan profile update settings.compiler.version=$env:GCC_VERSION valentina
-        compiler.cppstd=gnu17
-        compiler.libcxx=libstdc++11
-        compiler.version=$env:GCC_VERSION
-        os=Windows
-        $arch
-        "@
         }
-        $profile | Out-File -FilePath "$env:HOMEPATH\.conan2\profiles\valentina"
-    - conan profile show -pr valentina
     - qbs-config --list profiles
 
   build_script:
-    - conan install . -s os=Windows --build=xerces-c/[~3.2] -pr valentina
+    - conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina
     - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:[valentina]
   
   test_script:
@@ -502,8 +487,8 @@ for:
       - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
 
   init:
-    - QTDIR=$QT
+    - export QTDIR=$QT
-    - PATH="$QTDIR/bin:$PATH"
+    - export PATH="$QTDIR/bin:$PATH"
     - echo $PATH
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p
@@ -515,12 +500,12 @@ for:
     - rm '/usr/local/bin/cpack'
     - rm '/usr/local/bin/ctest'
     - brew install --force coreutils qbs cmake
+    - python3 --version
     - |
       if [[ "$ENABLE_CONAN" == "true" ]]; then
-        brew install --force conan;
+        pip3 install --user --upgrade conan==1.59;
         conan --version
       fi
-    - python3 --version
     - pip3 install --user --upgrade pip dropbox
     - clang --version
     - qmake --version
@@ -534,7 +519,7 @@ for:
     - pwd
     - |
       if [[ "$ENABLE_CONAN" == "true" ]]; then
-        conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/[~3.2]
+        conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
       fi
     - qbs setup-toolchains --detect
     - qbs config --list profiles

qbs/imports/conan/ConanfileProbe.qbs

@@ -28,7 +28,6 @@
 **
 ****************************************************************************/
 
-import qbs
 import qbs.Process
 import qbs.File
 import qbs.FileInfo
@@ -41,7 +40,7 @@ Probe {
     property path conanfilePath
     property path packageReference
     property path executable: "conan"
-    property stringList generators: []
+    property stringList generators: ["json"]
     property var options
     property var settings
     property bool verbose: false
@@ -98,7 +97,8 @@ Probe {
             });
         }
 
-        args = args.concat(["-f", "json"]);
+        if (!generators.contains("json"))
+            generators.push("json");
 
         for (var i = 0; i < generators.length; i++)
             args = args.concat(["-g", generators[i]]);
@@ -114,7 +114,7 @@ Probe {
                                                   "/genconan/" +
                                                   Utilities.getHash(args.join()));
 
-        args = args.concat(["-of", generatedFilesPath]);
+        args = args.concat(["-if", generatedFilesPath]);
         var p = new Process();
         p.start(executable, args);
         while (!p.waitForFinished(500)) {