diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml index f4333f7..52939c3 100644 --- a/.github/workflows/build-deb.yml +++ b/.github/workflows/build-deb.yml @@ -9,12 +9,15 @@ 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 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/.github/workflows/ubuntu-2204.yml b/.github/workflows/ubuntu-2204.yml new file mode 100644 index 0000000..2b14114 --- /dev/null +++ b/.github/workflows/ubuntu-2204.yml @@ -0,0 +1,24 @@ +name: Kronos for Latest Ubuntu + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + runs-on: ubuntu-22.04 + steps: + - 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 qtchooser -install qt6 $(which qmake6) + - name: Run qmake for Kronos + run: qmake6 + - name: Build Kronos + run: make -j8 + - name: Build unit tests + run: cd tests && qmake6 kronos-tests.pro && make -j8 + diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml deleted file mode 100644 index dfcdce3..0000000 --- a/.github/workflows/ubuntu-latest.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Kronos for Latest Ubuntu - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Install qt - run: sudo apt-get install qt5-default libqt5svg5 libqt5svg5-dev - - name: Run qmake for Kronos - run: qmake - - name: Build Kronos - run: make -j8 - - name: Build unit tests - run: cd tests && qmake kronos-tests.pro && make -j8 - diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 63ecb12..6b1735d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,27 +12,49 @@ 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' - arch: win64_mingw81 - version: '5.15.2' + tools: 'tools_ifw tools_qtcreator,qt.tools.qtcreator' + arch: win64_mingw + version: '6.7.*' + install-deps: 'true' + 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\qtenv2.bat + D:\a\kronos\Qt\6.7.2\mingw_64\bin\qmake6.exe --help - name: Build Kronos shell: cmd + 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" - qmake - make + cd + cd D:\a\kronos\kronos\ + cd + dir + dir D:\a\kronos\Qt\6.7.2\mingw_64\bin\ + where qmake6 + where qmake + where 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 D:\a\kronos\kronos\kronos.pro + dir + 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" - qmake 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: | 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/debian/control b/debian/control index bc884a0..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), qtbase5-dev, libqt5svg5-dev +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 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