Skip to content

Commit

Permalink
Disable set modified time on qt 5.9 (open-eid#1080)
Browse files Browse the repository at this point in the history
IB-7029

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma authored Jun 9, 2022
1 parent da5859e commit f4298ad
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
26 changes: 12 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build on macOS
runs-on: macos-latest
env:
MACOSX_DEPLOYMENT_TARGET: '10.14'
MACOSX_DEPLOYMENT_TARGET: 10.14
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -21,7 +21,7 @@ jobs:
branch: master
name: pkgs
path: libdigidocpp-pkg
repo: 'open-eid/libdigidocpp'
repo: open-eid/libdigidocpp
- name: Install dependencies
run: |
HASH=($(shasum prepare_osx_build_environment.sh))
Expand Down Expand Up @@ -50,11 +50,11 @@ jobs:
container: ${{ matrix.container }}
strategy:
matrix:
container: ['ubuntu:20.04', 'ubuntu:21.10', 'ubuntu:22.04']
container: ['ubuntu:20.04', 'ubuntu:22.04']
env:
DEBIAN_FRONTEND: noninteractive
DEBFULLNAME: 'github-actions'
DEBEMAIL: '[email protected]'
DEBFULLNAME: github-actions
DEBEMAIL: [email protected]
steps:
- name: Checkout
uses: actions/checkout@v1
Expand All @@ -69,7 +69,7 @@ jobs:
branch: master
name: debs
path: libdigidocpp-pkg
repo: 'open-eid/libdigidocpp'
repo: open-eid/libdigidocpp
- name: Install artifact
run: |
apt install --no-install-recommends -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.deb
Expand All @@ -96,26 +96,24 @@ jobs:
container: ${{ matrix.container }}
strategy:
matrix:
container: ['fedora:33']
container: ['fedora:34']
env:
MAKEFLAGS: -j3
steps:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: recursive
- name: Install Build Deps
run: dnf groupinstall -y "Development Tools" "Development Libraries" fedora-packager
- name: Install Deps
run: dnf install -y cmake openssl-devel vim-common qt5-qtsvg-devel qt5-linguist
run: dnf install -y gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt5-qtsvg-devel qt5-linguist
- name: Download artifact
uses: dawidd6/action-download-artifact@v2
with:
workflow: build.yml
branch: master
name: rpms
path: libdigidocpp-pkg
repo: 'open-eid/libdigidocpp'
repo: open-eid/libdigidocpp
- name: Install artifact
run: dnf install -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.rpm
- name: Build
Expand Down Expand Up @@ -174,7 +172,7 @@ jobs:
branch: master
name: msi
path: ./
repo: 'open-eid/libdigidocpp'
repo: open-eid/libdigidocpp
- name: Install artifact
run: |
Rename-Item "libdigidocpp*VS${{ matrix.vcver }}.msi" libdigidocpp.msi
Expand Down Expand Up @@ -220,7 +218,7 @@ jobs:
runs-on: ubuntu-20.04
env:
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
PROJECTNAME: 'open-eid/DigiDoc4-Client'
PROJECTNAME: open-eid/DigiDoc4-Client
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -235,7 +233,7 @@ jobs:
branch: master
name: debs
path: libdigidocpp-pkg
repo: 'open-eid/libdigidocpp'
repo: open-eid/libdigidocpp
- name: Install artifact
run: sudo dpkg -i libdigidocpp-pkg/*$(lsb_release -rs)*.deb
- name: Download Coverity Build Tool
Expand Down
2 changes: 2 additions & 0 deletions client/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,10 @@ Application::Application( int &argc, char **argv )
tl.remove();
QFile::copy(":/TSL/" + file, tl.fileName());
tl.setPermissions(QFile::Permissions(0x6444));
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
if(tl.open(QFile::Append))
tl.setFileTime(tslTime, QFileDevice::FileModificationTime);
#endif
}
}

Expand Down

0 comments on commit f4298ad

Please sign in to comment.