Merge branch 'develop' into 'material'
# Conflicts: # .appveyor.yml
This commit is contained in:
commit
7454dbc9d0
|
@ -17,7 +17,7 @@ before_build:
|
||||||
- git submodule update --init --recursive
|
- git submodule update --init --recursive
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- qmake spectral.pro CONFIG+=release CONFIG+=qtquickcompiler BUNDLE_FONT=true PREFIX="%DEPLOY_DIR%"
|
- qmake spectral.pro CONFIG+=release CONFIG+=qtquickcompiler PREFIX="%DEPLOY_DIR%"
|
||||||
- nmake
|
- nmake
|
||||||
|
|
||||||
after_build:
|
after_build:
|
||||||
|
|
Loading…
Reference in New Issue