Merge pull request #38887 from m-kuhn/pimp_5_14_build

Tune build with Qt 5.14
This commit is contained in:
Matthias Kuhn 2020-09-20 13:13:28 +02:00 committed by GitHub
commit 20e44e5870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 19 deletions

View File

@ -3,7 +3,6 @@ MAINTAINER Matthias Kuhn <matthias@opengis.ch>
RUN dnf -y install \
bison \
ccache \
clang \
clazy \
exiv2-devel \

View File

@ -3,10 +3,7 @@
mkdir /usr/src/qgis/build
cd /usr/src/qgis/build || exit -1
ccache -s
ln -s /../../bin/ccache /usr/lib64/ccache/clang
ln -s /../../bin/ccache /usr/lib64/ccache/clang++
CLANG_WARNINGS="-Wrange-loop-construct"
cmake -GNinja \
-DWITH_QUICK=OFF \
@ -28,12 +25,10 @@ cmake -GNinja \
-DWITH_ORACLE=OFF \
-DDISABLE_DEPRECATED=ON \
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
-DCMAKE_C_COMPILER=/usr/lib64/ccache/clang \
-DCMAKE_CXX_COMPILER=/usr/lib64/ccache/clang++ \
-DCMAKE_C_COMPILER=/bin/clang \
-DCMAKE_CXX_COMPILER=/bin/clang++ \
-DADD_CLAZY_CHECKS=ON \
-DWERROR=TRUE \
..
ninja
ccache -s

View File

@ -9,6 +9,8 @@ on:
- 'src/**'
- 'tests/**'
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'
pull_request:
branches:
- master
@ -17,6 +19,8 @@ on:
- 'src/**'
- 'tests/**'
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'
jobs:
build:
@ -29,14 +33,6 @@ jobs:
run: |
docker build -t qgis_build_deps -f .ci/qt5_14/Dockerfile .
- name: Cache
id: cache
uses: actions/cache@v2
with:
path: ~/.ccache
key: qt514
- name: Run build
run: |
docker run -v ~/.ccache:/root/ccache -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh
docker run -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh

View File

@ -286,7 +286,7 @@ QDomElement QgsMeshZValueDatasetGroup::writeXml( QDomDocument &doc, const QgsRea
QgsMeshZValueDataset::QgsMeshZValueDataset( const QgsMesh &mesh ): mMesh( mesh )
{
for ( const QgsMeshVertex vertex : mMesh.vertices )
for ( const QgsMeshVertex &vertex : mesh.vertices )
{
if ( vertex.z() < mZMinimum )
mZMinimum = vertex.z();