diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70196cd4f..bd7be4bd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Configure build run: mkdir build; ${{runner.os == 'Linux' && matrix.qt == 6 && 'qmake6' || 'qmake'}} - -o build PREFIX=/usr CONFIG+=release CONFIG+=GIT + -o build PREFIX=/usr CONFIG-=debug_and_release CONFIG+=release CONFIG+=GIT CONFIG+=PENCIL2D_${{github.ref == 'refs/heads/release' && 'RELEASE' || 'NIGHTLY'}} ${{matrix.qt == 6 && 'CONFIG+=c++17 QMAKE_CXX_FLAGS+=-std=c++17' || ''}} @@ -102,7 +102,7 @@ jobs: - name: Run tests env: { QT_QPA_PLATFORM: minimal } - run: build/tests/bin/tests + run: build/tests/tests - name: Create package id: package diff --git a/core_lib/core_lib.pro b/core_lib/core_lib.pro index 2b25e8d86..14cff7b59 100644 --- a/core_lib/core_lib.pro +++ b/core_lib/core_lib.pro @@ -6,17 +6,12 @@ ! include( ../util/common.pri ) { error( Could not find the common.pri file! ) } -QT += core widgets gui xml multimedia svg - TEMPLATE = lib CONFIG += staticlib precompile_header +QT += core widgets gui xml multimedia svg RESOURCES += data/core_lib.qrc -MOC_DIR = .moc -OBJECTS_DIR = .obj -UI_DIR = .ui - INCLUDEPATH += src \ src/graphics \ src/graphics/bitmap \ diff --git a/tests/tests.pro b/tests/tests.pro index 9bba5c9f3..7ddc5ff71 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -6,18 +6,12 @@ ! include( ../util/common.pri ) { error( Could not find the common.pri file! ) } -QT += core widgets gui xml multimedia svg testlib - TEMPLATE = app - -TARGET = tests - CONFIG += console CONFIG -= app_bundle +QT += core widgets gui xml multimedia svg testlib -MOC_DIR = .moc -OBJECTS_DIR = .obj -DESTDIR = bin +TARGET = tests RESOURCES += data/tests.qrc diff --git a/util/appveyor-mingw.yml b/util/appveyor-mingw.yml index 24eebc656..06f45461a 100644 --- a/util/appveyor-mingw.yml +++ b/util/appveyor-mingw.yml @@ -39,7 +39,7 @@ after_build: test_script: - echo "Running tests" - - cd "%APPVEYOR_BUILD_FOLDER%\build\tests\bin" + - cd "%APPVEYOR_BUILD_FOLDER%\build\tests\release" - tests.exe for: diff --git a/util/appveyor-msvc.yml b/util/appveyor-msvc.yml index acd185996..a5cf03449 100644 --- a/util/appveyor-msvc.yml +++ b/util/appveyor-msvc.yml @@ -38,7 +38,7 @@ after_build: test_script: - echo "Running tests" - - tests\bin\tests.exe + - tests\release\tests.exe for: - matrix: diff --git a/util/common.pri b/util/common.pri index f9fc6dea9..f23947401 100644 --- a/util/common.pri +++ b/util/common.pri @@ -1,4 +1,3 @@ - VERSION = 0.6.6 DEFINES += APP_VERSION=\\\"$$VERSION\\\"