Merge branch 'refs/heads/master' into transform-app-using-serversdk

# Conflicts:
#	src/colnod/requestmanager.cpp
This commit is contained in:
Filip Bucek 2019-11-27 13:47:27 +01:00
commit d334007f6c

View File

@ -24,6 +24,7 @@ build:
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --init --recursive - git submodule update --init --recursive
script: script:
- if [ -d build ]; then rm -rf build; fi
- mkdir -p build - mkdir -p build
- cd build - cd build
- qmake $PRO_FILE - qmake $PRO_FILE
@ -37,6 +38,7 @@ test:
tags: tags:
- shell - shell
script: script:
- if [ -d build ]; then rm -rf build; fi
- mkdir -p build - mkdir -p build
- cd build - cd build
- qmake $PRO_FILE - qmake $PRO_FILE
@ -48,6 +50,7 @@ valgrind:
tags: tags:
- shell - shell
script: script:
- if [ -d build ]; then rm -rf build; fi
- mkdir -p build - mkdir -p build
- cd build - cd build
- qmake $PRO_FILE - qmake $PRO_FILE