Fix building.

.cirrus.yml

@@ -71,7 +71,7 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
     - cd ${CIRRUS_WORKING_DIR}/build/coverage-dir
     # --preserve-paths helps us avoid name clash for `.gcov` files corresponding to source files
     # with the same name but in different directories.
-    - find .. -name '*.o' | xargs gcov --preserve-paths
+    - find .. -name '*.o' -exec gcov --preserve-paths {} \;
     - cd $CIRRUS_WORKING_DIR
     - sonar-scanner -Dsonar.scm.revision=${CIRRUS_CHANGE_IN_REPO} -Dsonar.links.ci=https://cirrus-ci.com/task/${CIRRUS_TASK_ID} -Dsonar.branch.name=${CIRRUS_BRANCH} -Dsonar.cfamily.gcov.reportsPath="${CIRRUS_WORKING_DIR}/build/coverage-dir"
     - ccache -s
@@ -128,7 +128,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE
   conan_cache:
     folder: "~/.conan/data"
   install_script:
-    - bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential libgl1-mesa-dev libicu-dev python3-pip"
+    - bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential libgl1-mesa-dev libicu-dev python3-pip cmake"
     - python3 --version
     - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
   build_script:
@@ -149,7 +149,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE
     - conan profile new valentina
     - conan profile update settings.build_type=Release valentina
     - conan profile update settings.os=Linux valentina
-    - conan profile update settings.arch=x86_64
+    - conan profile update settings.arch=x86_64 valentina
     - conan profile update settings.compiler=gcc valentina
     - conan profile update settings.compiler.cppstd=17 valentina
     - conan profile update settings.compiler.libcxx=libstdc++11 valentina
@@ -361,15 +361,11 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - echo $PATH
     - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
     - echo $PATH
-    - chmod -R 755 /opt/homebrew/opt/qt6/*
-    - chmod -R 755 /opt/homebrew/opt/openssl@1.1/*
-    - chmod -R 755 /opt/homebrew/opt/poppler/*
-    - chmod -R 755 /opt/homebrew/opt/xerces-c/*
     - python3 --version
     - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
     - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
-    - qmake --version
+    - qmake6 --version
-    - which qmake
+    - which qmake6
     - qbs --version
   build_script:
     - echo $PATH
@@ -394,12 +390,12 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - conan profile update settings.compiler.version=14 valentina
     - qbs setup-toolchains --detect
     - qbs config --list profiles
-    - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
+    - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake6 qt6
     - qbs config defaultProfile qt6
     - qbs config profiles.qt6.baseProfile clang
     - conan install . -s os=Macos --build=missing -o with_crash_reporting=True -pr=valentina
     - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
-    - export CRASH_QT_VERSION=$(/opt/homebrew/opt/qt6/bin/qmake -query QT_VERSION | awk -F. '{print $1 "_" $2}')
+    - export CRASH_QT_VERSION=$(/opt/homebrew/opt/qt6/bin/qmake6 -query QT_VERSION | awk -F. '{print $1 "_" $2}')
     - export CRASH_SHORT_SHA=$(git log --pretty=format:%h -n 1)
     - python3 scripts/symupload.py $CIRRUS_WORKING_DIR/build/install-root $VALENTINA_VERSION $CRASH_SHORT_SHA $CRASH_QT_VERSION --clean
     - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir

appveyor.yml

@@ -683,7 +683,10 @@ for:
     - conan profile update settings.build_type=Release valentina
     - conan profile update settings.os=Macos valentina
     - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
-    - conan profile update settings.compiler=clang valentina
+    - conan profile update settings.os.os_build=Macos valentina
+    - conan profile update settings.os.arch=x86_64 valentina
+    - conan profile update settings.os.arch_build=x86_64 valentina
+    - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
     - conan profile update settings.compiler.libcxx=libstdc++11 valentina
     - conan profile update settings.compiler.version=15 valentina
@@ -878,7 +881,10 @@ for:
     - conan profile update settings.build_type=Release valentina
     - conan profile update settings.os=Macos valentina
     - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
-    - conan profile update settings.compiler=clang valentina
+    - conan profile update settings.os_build=Macos valentina
+    - conan profile update settings.os.arch=x86_64 valentina
+    - conan profile update settings.os.arch_build=x86_64 valentina
+    - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
     - conan profile update settings.compiler.libcxx=libstdc++11 valentina
     - conan profile update settings.compiler.version=14 valentina

conanfile.py

@@ -24,7 +24,9 @@ class Recipe(ConanFile):
 
   def requirements(self):
     if not self.options.with_xerces:
-      del self.requires["xerces-c"]
+      if "xerces-c" in self.requires:
+        del self.requires["xerces-c"]
 
     if not self.options.with_crash_reporting:
-      del self.requires["sentry-crashpad/0.6.5"]
+      if "sentry-crashpad/0.6.5" in self.requires:
+        del self.requires["sentry-crashpad/0.6.5"]

src/app/tape/tape.pri

@@ -20,7 +20,8 @@ SOURCES  += \
     $$PWD/dialogs/dialogsetupmultisize.cpp \
     $$PWD/vtapeshortcutmanager.cpp \
     $$PWD/tkmmainwindow.cpp \
-    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp
+    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp \
+    $$PWD/dialogs/dialognoknownmeasurements.cpp
 
 *msvc*:SOURCES += $$PWD/stable.cpp
 
@@ -44,7 +45,8 @@ HEADERS  += \
     $$PWD/dialogs/dialogsetupmultisize.h \
     $$PWD/vtapeshortcutmanager.h \
     $$PWD/tkmmainwindow.h \
-    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.h
+    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.h \
+    $$PWD/dialogs/dialognoknownmeasurements.h
 
 FORMS    += \
     $$PWD/dialogs/dialogdimensioncustomnames.ui \
@@ -60,5 +62,6 @@ FORMS    += \
     $$PWD/dialogs/configpages/tapepreferencespathpage.ui \
     $$PWD/dialogs/dialogsetupmultisize.ui \
     $$PWD/tkmmainwindow.ui \
-    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui
+    $$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui \
+    $$PWD/dialogs/dialognoknownmeasurements.ui
 

src/libs/vmisc/crashhandler/crashhandler.cpp

@@ -246,6 +246,6 @@ auto InitializeCrashpad(const QString &appName) -> bool
 
     // Start crash handler
     auto *client = new CrashpadClient();
-    return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), annotations.toStdMap(), arguments,
+    return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), "", annotations.toStdMap(),
-                                true, true, attachments);
+                                arguments, true, true, attachments);
 }