Browse Source

Merge pull request #1386 from RytoEX/qt-511

CI: Update to Qt 5.11.1
Jim 7 năm trước cách đây
mục cha
commit
324fcbcd92

+ 1 - 1
CI/install-dependencies-osx.sh

@@ -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."

+ 1 - 0
UI/frontend-plugins/frontend-tools/captions.cpp

@@ -1,4 +1,5 @@
 #include <QMessageBox>
+#include <QAction>
 
 #include <windows.h>
 #include <obs-frontend-api.h>

+ 2 - 2
appveyor.yml

@@ -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