opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1386 from RytoEX/qt-511

Browse Source 
CI: Update to Qt 5.11.1
This commit is contained in:
Jim
2018-07-27 21:21:24 -07:00
committed by GitHub
parent 74093253bf 729abd3825
commit 324fcbcd92
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CI/install-dependencies-osx.sh
+1 -1
View File
@@ -24,7 +24,7 @@ sudo installer -pkg ./Packages.pkg -target /
brew update
#Base OBS Deps and ccache
brew install qt5 jack speexdsp ccache swig
brew install qt@5.11 jack speexdsp ccache swig
export PATH=/usr/local/opt/ccache/libexec:$PATH
ccache -s || echo "CCache is not available."
UI/frontend-plugins/frontend-tools/captions.cpp
+1
View File
@@ -1,4 +1,5 @@
#include <QMessageBox>
#include <QAction>
#include <windows.h>
#include <obs-frontend-api.h>
appveyor.yml
+2 -2
View File
@@ -11,8 +11,8 @@ install:
- set DepsPath32=%CD%\dependencies2017\win32
- set DepsPath64=%CD%\dependencies2017\win64
- set VLCPath=%CD%\vlc
- set QTDIR32=C:\Qt\5.10.1\msvc2015
- set QTDIR64=C:\Qt\5.10.1\msvc2017_64
- set QTDIR32=C:\Qt\5.11.1\msvc2015
- set QTDIR64=C:\Qt\5.11.1\msvc2017_64
- set build_config=RelWithDebInfo
- mkdir build build32 build64
- cd ./build32