From e22a501aa76dee6693d0bcf06fd65f3cd63b7f48 Mon Sep 17 00:00:00 2001 From: Dave Griffiths Date: Sun, 30 Oct 2022 11:24:46 +0000 Subject: [PATCH] trying removing deps --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 2 +- app/gui/samplebrain.ui | 4 ++-- app/qtmain.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92f42cd..cdb6f06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ build-job: image: ubuntu:22.04 script: - apt-get update - - apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev qt5-qmake qtbase5-dev-tools + - apt-get install -y git cmake g++ freeglut3-dev qt6-base-dev - mkdir -p build - cd build - cmake .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ff1de6..e63ad56 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 Qt5 Qt6 REQUIRED COMPONENTS Core) +find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets) find_package(OpenMP) diff --git a/app/gui/samplebrain.ui b/app/gui/samplebrain.ui index 0a2158c..e25d293 100644 --- a/app/gui/samplebrain.ui +++ b/app/gui/samplebrain.ui @@ -7,7 +7,7 @@ 0 0 1188 - 898 + 939 @@ -1651,7 +1651,7 @@ - + diff --git a/app/qtmain.cpp b/app/qtmain.cpp index a0573c1..645a990 100644 --- a/app/qtmain.cpp +++ b/app/qtmain.cpp @@ -33,7 +33,7 @@ int main( int argc , char *argv[] ){ QApplication app(argc, argv); - + cerr<<"Qt version: "<