mirror of
https://github.com/arcan1s/awesome-widgets.git
synced 2025-09-16 04:09:55 +00:00
do not use nodiscard for slots (#147)
This commit is contained in:
@ -1,12 +1,14 @@
|
||||
FROM ubuntu:bionic
|
||||
FROM ubuntu:focal
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update
|
||||
# toolchain
|
||||
RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
|
||||
RUN apt-get install -yq cmake extra-cmake-modules g++ git gettext
|
||||
# kf5 and qt5 libraries
|
||||
RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
|
||||
RUN apt-get install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
|
||||
plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN apt-get install -y xvfb
|
||||
RUN apt-get install -yq xvfb
|
||||
|
@ -1,12 +0,0 @@
|
||||
FROM multiarch/ubuntu-core:i386-bionic
|
||||
|
||||
RUN apt-get update
|
||||
# toolchain
|
||||
RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
|
||||
# kf5 and qt5 libraries
|
||||
RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
|
||||
plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN apt-get install -y xvfb
|
@ -6,8 +6,8 @@ rm -rf build-ubuntu
|
||||
mkdir build-ubuntu
|
||||
|
||||
# patches
|
||||
git apply patches/qt5.6-qversionnumber.patch
|
||||
git apply patches/qt5.5-qstringlist-and-qinfo.patch
|
||||
#git apply patches/qt5.6-qversionnumber.patch
|
||||
#git apply patches/qt5.5-qstringlist-and-qinfo.patch
|
||||
|
||||
# build
|
||||
cd build-ubuntu
|
||||
|
Reference in New Issue
Block a user