From a5f0a1488e6e3581ea56a8378c0b111229b13aba Mon Sep 17 00:00:00 2001
From: Marko Bencun <marko@shiftcrypto.ch>
Date: Thu, 24 Oct 2024 07:53:41 +0200
Subject: [PATCH] wip

---
 appveyor.yml          | 11 ++++-------
 frontends/qt/main.cpp |  3 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index be3209a960..7215cd36e2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,26 +3,23 @@ image: Visual Studio 2019
 environment:
   nodejs_version: "20"
   matrix:
+    - QT: C:\Qt\6.2\msvc2019_64
       # As installed by `choco`
-    - GOROOT: C:\Program Files\Go
+      GOROOT: C:\Program Files\Go
       GOPATH: C:\gopath\
       GOTOOLCHAIN: local
       PLATFORM: amd64
-      PYTHON: C:\Python312
+      COMPILER: msvc
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - choco install python --version=3.12.6
-  - python -m pip install aqtinstall
-  - aqt list-qt windows desktop --modules 6.2.4 win64_mingw
-  - aqt install-qt windows desktop 6.2.4 win64_mingw -m qtpositioning qtserialport qtwebchannel qtwebengine
   - git submodule update --init --recursive
 
 matrix:
   fast_finish: true
 
 before_build:
-  - set PATH=C:\Qt\Tools\QtCreator\bin\;%GOROOT%\bin;C:\gopath\bin\;C:\Qt\6.2.4\mingw_64\bin\;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\MinGW\bin;%PATH%
+  - set PATH=%QT5%\bin;C:\Qt\Tools\QtCreator\bin\;%GOROOT%\bin;C:\gopath\bin\;C:\Qt\6.2\msvc2019_64\bin\;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\MinGW\bin;%PATH%
   - set MINGW_BIN=/c/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin
 
 build_script:
diff --git a/frontends/qt/main.cpp b/frontends/qt/main.cpp
index 07bfcad564..3aa83a8e12 100644
--- a/frontends/qt/main.cpp
+++ b/frontends/qt/main.cpp
@@ -47,6 +47,9 @@
 #include <string.h>
 
 #include "filedialog.h"
+#ifndef _MSC_VER
+#undef _MSV_VER
+#endif
 #include "server/libserver.h"
 #include "webclass.h"