From 040d9745159b70e30ca5aeada0cea838786381c1 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sat, 8 Oct 2022 20:45:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=82=D1=8C=20=D0=BA=20qmake=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=91=D1=82=D1=81=D1=8F=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scheduled.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scheduled.yml b/scheduled.yml
index 83623f2..299eb5c 100644
--- a/scheduled.yml
+++ b/scheduled.yml
@@ -5,6 +5,7 @@ variables:
   CI_BUILD_DIR: _build
   CI_OUTPUT_DIR: _output
   CI_CMAKE: /usr/bin/cmake
+  CI_QMAKE5: /usr/bin/qmake
 
 .add-ssh-key:
   before_script:
@@ -38,7 +39,7 @@ variables:
       fi
     - rm -f ${CI_JOB_NAME}.status
     - mkdir -p ${CI_BUILD_DIR}
-    - qmake -o ${CI_BUILD_DIR}/Makefile ${QMAKE_PRO_FILE}
+    - ${CI_QMAKE} -o ${CI_BUILD_DIR}/Makefile ${QMAKE_PRO_FILE}
     - make -j8 -C ${CI_BUILD_DIR}
     - echo "${CI_COMMIT_SHA}" > "${CI_JOB_NAME}.status"
 
@@ -120,7 +121,8 @@ variables:
 
 .scheduled-mxe-focal:
   variables:
-    CI_CMAKE: /usr/lib/mxe/usr/x86_64-pc-linux-gnu/bin/cmake
+    CI_QMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5
+    CI_CMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake
     CI_USE_MXE: 1
   extends: .scheduled-test
   image: mxe-focal-dev
@@ -205,7 +207,7 @@ variables:
   before_script:
     - !reference [.add-ssh-key, before_script]
   script:
-    - qmake ${QMAKE_PRO_FILE}
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
     - bear -- make -k -j$(nproc)
     - pvs-studio-analyzer analyze -a 29 -j$(nproc)
     - plog-converter -a "GA:1,2,3;64:1;OP:1,2;CS:1,2" -t errorfile PVS-Studio.log
@@ -217,7 +219,7 @@ variables:
   before_script:
     - !reference [.add-ssh-key, before_script]
   script:
-    - qmake ${QMAKE_PRO_FILE}
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
     - bear -- make -k -j$(nproc)
     - run-clang-tidy-14 -checks=-*,bugprone-*,clang-analyzer-*,misc-*,modernize-*,performance-*,portability-*
 
@@ -228,7 +230,7 @@ variables:
   before_script:
     - !reference [.add-ssh-key, before_script]
   script:
-    - qmake ${QMAKE_PRO_FILE}
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
     - bear -- make -k -j$(nproc)
     - find . -name "*.cpp" -print0 | xargs -0 clazy-standalone --ignore-dirs=/usr -checks=level2 -p compile_commands.json