From 0ab061eb0e89617414ce57bf1f648fbd588a5f98 Mon Sep 17 00:00:00 2001
From: Dave Griffiths <dave@thentrythis.org>
Date: Sun, 30 Oct 2022 18:37:28 +0000
Subject: [PATCH] back to qt5 again to attempt win ci to work (choco doesn't
 seem to have qt6 yet)

---
 .gitlab-ci.yml | 10 +++++-----
 CMakeLists.txt | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 088eadc..4ad2611 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,23 @@
-build-job:
+build-ubuntu:
   stage: build
   image: ubuntu:22.04
   script:
     - apt-get update
-    - apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev 
+    - apt-get install -y git cmake g++ freeglut3-dev qtbase5-dev qt5-qmake qtbase5-dev-tools
     - mkdir -p build
     - cd build
     - cmake ..
-    - cmake --build .
+    - cmake --build . --target samplebrain
 
 build-win64:
   tags:
     - "windows"
   before_script:
-    - choco install -y cmake python
+    - choco install -y cmake python qt5-default
     - $env:Path += ';C:\Program Files\CMake\bin'
   stage: build
   script:
     - mkdir build 
     - cd build
     - cmake ..
-    - cmake --build .
+    - cmake --build . --target samplebrain
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e63ad56..c44b16a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
+find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
 find_package(OpenMP)
 
@@ -56,9 +56,9 @@ target_include_directories(samplebrain PRIVATE
 )
 
 target_link_libraries(samplebrain PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets
     fftw3
     lo_shared
     portaudio
@@ -80,11 +80,11 @@ set(samplebrain_resource_files
     "app/images/stop.png"
 )
 
-qt_add_resources(samplebrain "samplebrain"
+qt5_add_resources(samplebrain "samplebrain"
     PREFIX
         "/images"
-    BASE
-        "app"
+    #BASE
+    #    "app"
     FILES
         ${samplebrain_resource_files}
 )