From 20dbd1fcf00f85009c593dcd58378492ad22b70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 14:23:27 +0200 Subject: [PATCH 01/29] Support building with qt6 --- .gitignore | 1 + jira/jiraclient.cpp | 4 +++- kronos.pro | 2 +- stable.h | 2 +- widgets/kronoscalendarwidget.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aae538f..99d08a3 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ debian/kronos debian/kronos.substvars debian/.debhelper kronos +build/ diff --git a/jira/jiraclient.cpp b/jira/jiraclient.cpp index 51019d9..3df27f8 100644 --- a/jira/jiraclient.cpp +++ b/jira/jiraclient.cpp @@ -40,9 +40,11 @@ QString JiraClient::jqlDate(QDate date) { return date.toString("yyyy-MM-dd"); } +// ATATT3xFfGF0bh47W6QBlgSTi3buOuCeBkusH0fToRkFyu3obQsD5gMGVf4sgv58cNmJ56x1c_JVtemr7 + void JiraClient::myself() { - QUrl u = url("/rest/api/latest/myself"); + QUrl u = url("/rest/api/2/myself"); auto reply = get(u); QObject::connect(reply, &QNetworkReply::finished, [this, reply] { diff --git a/kronos.pro b/kronos.pro index f8f141e..a3a1389 100644 --- a/kronos.pro +++ b/kronos.pro @@ -1,4 +1,4 @@ -QT += core widgets svg +QT += core widgets svg svgwidgets core5compat CONFIG += c++11 diff --git a/stable.h b/stable.h index 7044ed7..cd79a88 100644 --- a/stable.h +++ b/stable.h @@ -15,7 +15,7 @@ #include #include #include -#include +//#include #include #include #include diff --git a/widgets/kronoscalendarwidget.h b/widgets/kronoscalendarwidget.h index f3fdf27..3fd699f 100644 --- a/widgets/kronoscalendarwidget.h +++ b/widgets/kronoscalendarwidget.h @@ -48,7 +48,7 @@ public slots: */ void updateWorklogData(QDate d); protected: - void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const override; + void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const; }; #endif // KRONOSCALENDARWIDGET_H From 50b5e8508de1878e3cf8b849fbc5e417d056953e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 14:50:51 +0200 Subject: [PATCH 02/29] Switch build dependency to qt6 --- .github/workflows/ubuntu-latest.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index dfcdce3..45a579a 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -8,13 +8,11 @@ on: jobs: build: - - runs-on: ubuntu-latest - + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Install qt - run: sudo apt-get install qt5-default libqt5svg5 libqt5svg5-dev + run: sudo apt update && sudo apt install build-essential libgl1-mesa-dev qt6-base-dev - name: Run qmake for Kronos run: qmake - name: Build Kronos From 288fc5fe447b88854a61551a3f1ec55354d63299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 15:16:29 +0200 Subject: [PATCH 03/29] Update ubuntu-latest.yml --- .github/workflows/ubuntu-latest.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index 45a579a..e9e05fa 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -12,7 +12,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install qt - run: sudo apt update && sudo apt install build-essential libgl1-mesa-dev qt6-base-dev + run: sudo apt update + - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev + - run: sudo qtchooser -install qt6 $(which qmake6) - name: Run qmake for Kronos run: qmake - name: Build Kronos From a535652f247c7b9d29fe67e20c01d7c433f092b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 15:17:52 +0200 Subject: [PATCH 04/29] Update ubuntu-latest.yml --- .github/workflows/ubuntu-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index e9e05fa..9f561d8 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -16,7 +16,7 @@ jobs: - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev - run: sudo qtchooser -install qt6 $(which qmake6) - name: Run qmake for Kronos - run: qmake + run: qmake6 - name: Build Kronos run: make -j8 - name: Build unit tests From 73bca56931c5caff8d36ad910f882b87b8920430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 15:20:34 +0200 Subject: [PATCH 05/29] Update ubuntu-latest.yml --- .github/workflows/ubuntu-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index 9f561d8..ae179b0 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - name: Install qt run: sudo apt update - - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev + - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev libqt6core5compat6-dev libqt6svg6 libqt6svg6-dev libqt6svgwidgets6 - run: sudo qtchooser -install qt6 $(which qmake6) - name: Run qmake for Kronos run: qmake6 From 9d6da334b7e0927daaf873dfe6926208f6f6668f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 15:22:27 +0200 Subject: [PATCH 06/29] Update ubuntu-latest.yml --- .github/workflows/ubuntu-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml index ae179b0..2b14114 100644 --- a/.github/workflows/ubuntu-latest.yml +++ b/.github/workflows/ubuntu-latest.yml @@ -20,5 +20,5 @@ jobs: - name: Build Kronos run: make -j8 - name: Build unit tests - run: cd tests && qmake kronos-tests.pro && make -j8 + run: cd tests && qmake6 kronos-tests.pro && make -j8 From 2604d3a488bf12137c392ebd8ce575e3d7a41c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 16:14:42 +0200 Subject: [PATCH 07/29] Work on windows build --- .github/workflows/{ubuntu-latest.yml => ubuntu-2204.yml} | 0 .github/workflows/windows.yml | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename .github/workflows/{ubuntu-latest.yml => ubuntu-2204.yml} (100%) diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-2204.yml similarity index 100% rename from .github/workflows/ubuntu-latest.yml rename to .github/workflows/ubuntu-2204.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 63ecb12..d84bfac 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,14 +12,16 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v4 with: # Latest versions of these tools can be found at: # https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_qtcreator/qt.tools.qtcreator/ # https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_ifw/ - tools: 'tools_ifw,4.1,qt.tools.ifw.41 tools_qtcreator,4.14.2-0-202103191046,qt.tools.qtcreator' + tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' arch: win64_mingw81 - version: '5.15.2' + version: '6.7.*' + install-deps: 'true' + setup-python: 'false' - name: Build Kronos shell: cmd run: | From f6345c693c8ead9b4a6b6d36f16ac63809602c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 16:18:40 +0200 Subject: [PATCH 08/29] Work on deb package + windows build --- .github/workflows/build-deb.yml | 6 ++++-- .github/workflows/windows.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index f4333f7..34e9b80 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -9,12 +9,14 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Install qt - run: sudo apt-get install qt5-default libqt5svg5 libqt5svg5-dev debhelper devscripts build-essential + run: sudo apt update + - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev libqt6core5compat6-dev libqt6svg6 libqt6svg6-dev libqt6svgwidgets6 + - run: sudo qtchooser -install qt6 $(which qmake6) - name: Build kronos and create .deb file run: sudo debuild -uc -us && mv ../kronos_1.0_amd64.deb . - name: Save resulting package as an artifact diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d84bfac..e762615 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,6 +22,8 @@ jobs: version: '6.7.*' install-deps: 'true' setup-python: 'false' + modules: 'qtcharts qtwebengine' + archives: 'qtbase qtsvg' - name: Build Kronos shell: cmd run: | From 5b3940aa8f9d5b9af43fead74bd70f46ec5aeeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 16:27:26 +0200 Subject: [PATCH 09/29] Update build-deb.yml --- .github/workflows/build-deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index 34e9b80..a469363 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Install qt run: sudo apt update - - run: sudo apt install build-essential libgl1-mesa-dev qt6-base-dev libqt6core5compat6-dev libqt6svg6 libqt6svg6-dev libqt6svgwidgets6 + - run: sudo apt install debhelper devscripts build-essential libgl1-mesa-dev qt6-base-dev libqt6core5compat6-dev libqt6svg6 libqt6svg6-dev libqt6svgwidgets6 - run: sudo qtchooser -install qt6 $(which qmake6) - name: Build kronos and create .deb file run: sudo debuild -uc -us && mv ../kronos_1.0_amd64.deb . From c2b604702e7f2a84fdf909ff7fe9b7f9071d9b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 16:37:18 +0200 Subject: [PATCH 10/29] Update control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bc884a0..1d957be 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Soeren Boll Overgaard Section: misc Priority: optional Standards-Version: 4.5.0 -Build-Depends: debhelper (>= 9), qtbase5-dev, libqt5svg5-dev +Build-Depends: debhelper (>= 9), libgl1-mesa-dev,qt6-base-dev,libqt6core5compat6-dev,libqt6svg6,libqt6svg6-dev,libqt6svgwidgets6 Vcs-Browser: https://github.com/llob/kronos Package: kronos From 69e86b7b2ffe854a338a02969101f71fefaca855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 16:48:45 +0200 Subject: [PATCH 11/29] More work on debian package --- .github/workflows/build-deb.yml | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index a469363..52939c3 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -17,6 +17,7 @@ jobs: run: sudo apt update - run: sudo apt install debhelper devscripts build-essential libgl1-mesa-dev qt6-base-dev libqt6core5compat6-dev libqt6svg6 libqt6svg6-dev libqt6svgwidgets6 - run: sudo qtchooser -install qt6 $(which qmake6) + - run: sudo rm /usr/bin/qmake && sudo ln -s /usr/bin/qmake6 /usr/bin/qmake - name: Build kronos and create .deb file run: sudo debuild -uc -us && mv ../kronos_1.0_amd64.deb . - name: Save resulting package as an artifact diff --git a/debian/control b/debian/control index 1d957be..7de7209 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: kronos Maintainer: Soeren Boll Overgaard Section: misc Priority: optional -Standards-Version: 4.5.0 -Build-Depends: debhelper (>= 9), libgl1-mesa-dev,qt6-base-dev,libqt6core5compat6-dev,libqt6svg6,libqt6svg6-dev,libqt6svgwidgets6 +Standards-Version: 4.7.0 +Build-Depends: debhelper (>= 13), libgl1-mesa-dev,qt6-base-dev,libqt6core5compat6-dev,libqt6svg6,libqt6svg6-dev,libqt6svgwidgets6 Vcs-Browser: https://github.com/llob/kronos Package: kronos From 7b21d0ed9a73a4f381687bf73dfaa2c2d66dd7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 17:07:25 +0200 Subject: [PATCH 12/29] Update windows.yml --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e762615..61f22ae 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,11 +18,11 @@ jobs: # https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_qtcreator/qt.tools.qtcreator/ # https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/tools_ifw/ tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' - arch: win64_mingw81 + arch: win64_mingw version: '6.7.*' install-deps: 'true' setup-python: 'false' - modules: 'qtcharts qtwebengine' + modules: 'qtgraphs qtcharts qtwebview qt5compat' archives: 'qtbase qtsvg' - name: Build Kronos shell: cmd From fc52987e2fa0411a4df6095b3b92be3fad8de848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 18:21:17 +0200 Subject: [PATCH 13/29] Update windows.yml --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 61f22ae..e3b08ca 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,14 +28,14 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - qmake + qmake6 kronos.pro make - name: Build unit tests shell: cmd working-directory: tests run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - qmake kronos-tests.pro + qmake6 kronos-tests.pro make - name: Copy icon into installer shell: cmd From 97b6781d0a54822ce4ea7c844b2b88d3fda49801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 18:49:40 +0200 Subject: [PATCH 14/29] Update windows.yml --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e3b08ca..a8b31db 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,7 +35,8 @@ jobs: working-directory: tests run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - qmake6 kronos-tests.pro + qmake6 --version + qmake6 -makefile kronos-tests.pro make - name: Copy icon into installer shell: cmd From 08d9eed530e19f377ce7deef4b50b91c07a7d8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 19:13:22 +0200 Subject: [PATCH 15/29] Update windows.yml --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a8b31db..ae0ae33 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,7 +28,8 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - qmake6 kronos.pro + qmake6 --version + qmake6 -makefile kronos.pro make - name: Build unit tests shell: cmd From 6220756ac9674d7ef04917e527154f5810ba7b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 19:20:32 +0200 Subject: [PATCH 16/29] Update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ae0ae33..90b6676 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,6 +28,7 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + foobar qmake6 --version qmake6 -makefile kronos.pro make From 2673efe779e0db5e340d7cc3597552d3f622ed5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 19:29:21 +0200 Subject: [PATCH 17/29] Update windows.yml --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 90b6676..5e3b3eb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,9 +26,9 @@ jobs: archives: 'qtbase qtsvg' - name: Build Kronos shell: cmd + # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - foobar + call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" qmake6 --version qmake6 -makefile kronos.pro make From 648ea58a09d6a85dab1345cff0b95b920edd2d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:29:01 +0200 Subject: [PATCH 18/29] Update windows.yml --- .github/workflows/windows.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5e3b3eb..1fd715e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,9 +26,13 @@ jobs: archives: 'qtbase qtsvg' - name: Build Kronos shell: cmd - # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" run: | call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" + cd + where qmake6 + where qmake + where make qmake6 --version qmake6 -makefile kronos.pro make From 3b065432b68e919d226bd1d6cf8e733a125a7ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:33:41 +0200 Subject: [PATCH 19/29] Update windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1fd715e..ea0f7c2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,7 +28,7 @@ jobs: shell: cmd run: | call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64" cd where qmake6 where qmake From a494e7b238639a1622e2a7c884529e541291d685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:42:13 +0200 Subject: [PATCH 20/29] Update windows.yml --- .github/workflows/windows.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ea0f7c2..d2fd9c3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,22 +28,22 @@ jobs: shell: cmd run: | call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64" + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cd where qmake6 where qmake where make - qmake6 --version - qmake6 -makefile kronos.pro - make + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro + C:\mingw64\bin\make - name: Build unit tests shell: cmd working-directory: tests run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - qmake6 --version - qmake6 -makefile kronos-tests.pro - make + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe --version + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe -makefile kronos-tests.pro + C:\mingw64\bin\make.exe - name: Copy icon into installer shell: cmd run: | From cc0afb9fd589abd6ef62526c3b8aaa14dd8bd5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:47:54 +0200 Subject: [PATCH 21/29] Update windows.yml --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d2fd9c3..81ca891 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -33,9 +33,9 @@ jobs: where qmake6 where qmake where make - D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version - D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro - C:\mingw64\bin\make + call D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version + call D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro + call C:\mingw64\bin\make - name: Build unit tests shell: cmd working-directory: tests From de03706a4744634b907c9bbb4a5f8d1dc8454150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:52:54 +0200 Subject: [PATCH 22/29] Update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 81ca891..ca2d3f7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,6 +26,7 @@ jobs: archives: 'qtbase qtsvg' - name: Build Kronos shell: cmd + working-directory: D:\a\kronos run: | call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" From 07cbfdfd55e00f0d3c720a9e163604ef1229e9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 21:57:44 +0200 Subject: [PATCH 23/29] Update windows.yml --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ca2d3f7..21006dc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,6 +31,8 @@ jobs: call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cd + cd D:\a\kronos + cd where qmake6 where qmake where make From f3f62727b2ffe106bd826b1018c2b05f4a44dcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:04:34 +0200 Subject: [PATCH 24/29] Update windows.yml --- .github/workflows/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 21006dc..4a06d08 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,14 +31,14 @@ jobs: call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cd - cd D:\a\kronos + cd D:\a\kronos\kronos\ cd where qmake6 where qmake where make - call D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version - call D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro - call C:\mingw64\bin\make + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro + C:\mingw64\bin\make - name: Build unit tests shell: cmd working-directory: tests From 6170eec4862d62cd4798d507cdc969ccda56beb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:27:55 +0200 Subject: [PATCH 25/29] Update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4a06d08..4eb8bb7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -33,6 +33,7 @@ jobs: cd cd D:\a\kronos\kronos\ cd + dir where qmake6 where qmake where make From d095226371a3708512d7d19e17c69ff654b06e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:33:10 +0200 Subject: [PATCH 26/29] Update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4eb8bb7..f099bb3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,6 +34,7 @@ jobs: cd D:\a\kronos\kronos\ cd dir + dir D:\a\kronos\Qt\6.7.2\mingw_64\bin\ where qmake6 where qmake where make From da19945660b42e7ca8022eb4ceff93ac33ee47cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:39:07 +0200 Subject: [PATCH 27/29] Update windows.yml --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f099bb3..22d5264 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,8 +38,9 @@ jobs: where qmake6 where qmake where make - D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 --version - D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6 -makefile kronos.pro + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe --version + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe -makefile D:\a\kronos\kronos\kronos.pro + dir C:\mingw64\bin\make - name: Build unit tests shell: cmd From e6b143c7131d4d8a26adfe9f8d87196bbf8bb3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:45:54 +0200 Subject: [PATCH 28/29] Update windows.yml --- .github/workflows/windows.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 22d5264..07f6be4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,9 +24,13 @@ jobs: setup-python: 'false' modules: 'qtgraphs qtcharts qtwebview qt5compat' archives: 'qtbase qtsvg' + - name: Debugging funk + shell: cmd + run: | + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe --help - name: Build Kronos shell: cmd - working-directory: D:\a\kronos + working-directory: D:\a\kronos\kronos run: | call "D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" From 9907f1bee7e05838ffb8a3a6d7725e0e63eab3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Boll=20Overgaard?= Date: Wed, 7 Aug 2024 22:49:28 +0200 Subject: [PATCH 29/29] Update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 07f6be4..6b1735d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,6 +27,7 @@ jobs: - name: Debugging funk shell: cmd run: | + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qtenv2.bat D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe --help - name: Build Kronos shell: cmd