Merge branch 'master' of ssh://github.com/fluxer/kdelibs into devinfo

This commit is contained in:
Ivailo Monev 2021-08-27 16:09:45 +03:00
commit 8b359e4409
3 changed files with 5 additions and 9 deletions

View file

@ -42,7 +42,7 @@ jobs:
sudo apt-get install -qq wget
sudo wget https://raw.githubusercontent.com/fluxer/katana-ubuntu/master/katana.list -O /etc/apt/sources.list.d/katana.list
sudo apt-get update -qq
sudo apt-get install -qq cmake katie-dev libenchant-dev libopenexr-dev libmpv-dev libraw-dev xorg-dev mesa-common-dev libavahi-common-dev krb5-multidev perl-base libwebp-dev libudev-dev liblzma-dev libexiv2-dev libilmbase-dev libjpeg-dev libbz2-dev libattr1-dev libacl1-dev libxcb-render-util0-dev libxcb-keysyms1-dev libxcb-image0-dev libcdio-dev strigi libdbusmenu-katie media-player-info krb5-config shared-mime-info media-player-info xdg-utils
sudo apt-get install -qq cmake katie-dev libenchant-dev libmagick++-dev libmpv-dev xorg-dev mesa-common-dev libavahi-common-dev krb5-multidev libwebp-dev libudev-dev liblzma-dev libexiv2-dev libbz2-dev libattr1-dev libacl1-dev libcdio-dev strigi libdbusmenu-katie media-player-info krb5-config shared-mime-info media-player-info xdg-utils
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL

View file

@ -20,12 +20,10 @@ build_script:
sudo apt-get install -qq cmake katie-dev libenchant-dev \
libmagick++-dev libmpv-dev xorg-dev mesa-common-dev \
libavahi-common-dev krb5-multidev libwebp-dev \
libudev-dev liblzma-dev libexiv2-dev libilmbase-dev libjpeg-dev \
libbz2-dev libattr1-dev libacl1-dev libxcb-render-util0-dev \
libxcb-keysyms1-dev libxcb-image0-dev libcdio-dev strigi \
libdbusmenu-katie media-player-info krb5-config \
shared-mime-info media-player-info xdg-utils ccache
libavahi-common-dev krb5-multidev libwebp-dev libudev-dev \
liblzma-dev libexiv2-dev libbz2-dev libattr1-dev libacl1-dev \
libcdio-dev strigi libdbusmenu-katie media-player-info \
krb5-config shared-mime-info media-player-info xdg-utils ccache
export PATH="/usr/lib/ccache/:$PATH"

View file

@ -173,8 +173,6 @@ void KSaveFile::setFileName(const QString &filename)
// follow symbolic link, if any
d->realFileName = KStandardDirs::realFilePath( d->realFileName );
return;
}
QFile::FileError KSaveFile::error() const